[Igarden-commit] CommonSource/YAAFExtensions RGDialog.h, 1.5.2.6, 1.5.2.7 RGDialog.cpp, 1.7.2.13, 1.7.2.14

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

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

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

Index: RGDialog.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDialog.h,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -d -r1.5.2.6 -r1.5.2.7
*** RGDialog.h	23 Mar 2008 21:44:59 -0000	1.5.2.6
--- RGDialog.h	8 Apr 2008 22:21:34 -0000	1.5.2.7
***************
*** 78,81 ****
--- 78,85 ----
  	void			SetDefaultCancel(short val);
  	
+ protected:
+ 	short			_defaultOK;
+ 	short			_defaultCancel;
+ 
  private:
  	static long 	dialogProc(XGDialog *dlog, void *data, long msg, long arg, void *parg);
***************
*** 84,89 ****
  	RGPDialogCallbackProc	_cb;
  	void			*_cbContext;
- 	short			_defaultOK;
- 	short			_defaultCancel;
  	// **
  	char			*_alternateExitKeys;
--- 88,91 ----

Index: RGDialog.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDialog.cpp,v
retrieving revision 1.7.2.13
retrieving revision 1.7.2.14
diff -C2 -d -r1.7.2.13 -r1.7.2.14
*** RGDialog.cpp	23 Mar 2008 21:44:59 -0000	1.7.2.13
--- RGDialog.cpp	8 Apr 2008 22:21:34 -0000	1.7.2.14
***************
*** 118,122 ****
  			else
  			{
! 				obj->KeyPressed(dlog, low, high);
  				return 0;
  			}
--- 118,129 ----
  			else
  			{
! 				if(!obj->KeyPressed(dlog, low, high))
! 				{
! 					if(high == 0 && low == '\r')
! 					{
! 						obj->OKClicked(dlog);
! 						obj->Exit(obj->_defaultOK);
! 					}
! 				}
  				return 0;
  			}