[Igarden-commit] CommonSource/YAAFExtensions RGTableCell.cpp, 1.46.2.21, 1.46.2.22 RGTableCell.h, 1.23.2.10, 1.23.2.11

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/YAAFExtensions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4531/YAAFExtensions

Modified Files:
      Tag: Release_branch_v1
	RGTableCell.cpp RGTableCell.h 
Log Message:
Allow unhandled return key to exit dialogs

Index: RGTableCell.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.h,v
retrieving revision 1.23.2.10
retrieving revision 1.23.2.11
diff -C2 -d -r1.23.2.10 -r1.23.2.11
*** RGTableCell.h	30 Mar 2008 21:57:29 -0000	1.23.2.10
--- RGTableCell.h	8 Apr 2008 22:22:36 -0000	1.23.2.11
***************
*** 240,249 ****
  class AddRemoveDialog : public RGDialog
  {
! 	virtual void	Setup(XGDialog * /*dlog*/) {}
! 	virtual void	OKClicked(XGDialog * /*dlog*/)  { Exit(kDoAdd); }
! 	virtual void	CancelClicked(XGDialog * /*dlog*/)  { Exit(kdoCancel); }
! 	virtual void	ControlClick(XGDialog * /*dlog*/, long /*viewID*/)  { Exit(kDoReplace); }
! public:
! 	static bool		DoBooleanQueryDialog(long resID);
  };
  
--- 240,248 ----
  class AddRemoveDialog : public RGDialog
  {
! 	virtual void	Setup(XGDialog * /*dlog*/);
! 	virtual void	OKClicked(XGDialog * /*dlog*/);
! 	virtual void	CancelClicked(XGDialog * /*dlog*/);
! 	virtual void	ControlClick(XGDialog * /*dlog*/, long /*viewID*/);
! 	virtual bool	KeyPressed(XGDialog *dlog, short low, short high);
  };
  

Index: RGTableCell.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v
retrieving revision 1.46.2.21
retrieving revision 1.46.2.22
diff -C2 -d -r1.46.2.21 -r1.46.2.22
*** RGTableCell.cpp	30 Mar 2008 21:57:27 -0000	1.46.2.21
--- RGTableCell.cpp	8 Apr 2008 22:22:36 -0000	1.46.2.22
***************
*** 749,752 ****
--- 749,753 ----
  							break;
  					}
+ 					_parent->DoActivate(true);
  				}
  			}
***************
*** 1691,1692 ****
--- 1692,1724 ----
  }
  
+ #pragma mark *** AddRemoveDialog ***
+ 
+ void AddRemoveDialog::Setup(XGDialog * /*dlog*/)
+ {
+ }
+ 
+ void AddRemoveDialog::OKClicked(XGDialog * /*dlog*/)
+ {
+ 	Exit(kDoAdd);
+ }
+ 
+ void AddRemoveDialog::CancelClicked(XGDialog * /*dlog*/)
+ {
+ 	Exit(kdoCancel);
+ }
+ 
+ void AddRemoveDialog::ControlClick(XGDialog * /*dlog*/, long /*viewID*/)
+ {
+ 	Exit(kDoReplace);
+ }
+ 
+ bool AddRemoveDialog::KeyPressed(XGDialog *dlog, short low, short high)
+ {
+ 	if(high == 0 && low == '\r')
+ 	{
+ 		OKClicked(dlog);
+ 		return true;
+ 	}
+ 	else
+ 		return false;
+ }