[gnue] r8212 - trunk/gnue-forms/src

[johannes]

Author: johannes
Date: 2006-03-07 08:24:12 -0600 (Tue, 07 Mar 2006)
New Revision: 8212

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Do proper focus change for buttons too, so GF and UI focus can always 
match :)


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-03-07 12:44:13 UTC (rev 8211)
+++ trunk/gnue-forms/src/GFForm.py      2006-03-07 14:24:12 UTC (rev 8212)
@@ -1274,7 +1274,7 @@
       except KeyError:
         raise "setFocus failed: GFField is not bound to an GFEntry object."
 
-    if focus._type != 'GFEntry':
+    if not focus._type in ['GFEntry', 'GFButton']:
       raise "setFocus failed: Can just switch to GFEntry objects. " +\
             "You passed a '%s' object." % focus._type
     self.changeFocus(focus, 1)
@@ -1402,6 +1402,7 @@
       self._instance.activateForm (dialogName, parameters, modal)
 
 
+
   #---------------------------------------------------------------------------
   # Close this copy of gnue-forms
   #---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-03-07 12:44:13 UTC (rev 8211)
+++ trunk/gnue-forms/src/GFInstance.py  2006-03-07 14:24:12 UTC (rev 8212)
@@ -1089,7 +1089,7 @@
     if not event._form.endEditing ():
       return False
 
-    if event.data._type in ['GFEntry', 'GFImage']:
+    if event.data._type in ['GFEntry', 'GFImage', 'GFButton']:
       if not event.data.isNavigable (event._form.getCurrentMode ()):
         return False