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

[reinhard]

Author: reinhard
Date: 2006-10-16 08:20:53 -0500 (Mon, 16 Oct 2006)
New Revision: 8796

Modified:
   trunk/gnue-forms/src/GFForm.py
Log:
Use findAndChangeFocus also in setFocus trigger method.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-10-16 13:02:01 UTC (rev 8795)
+++ trunk/gnue-forms/src/GFForm.py      2006-10-16 13:20:53 UTC (rev 8796)
@@ -399,21 +399,11 @@
 
         self._in_trigger_lock = True
 
-        focus = object._object
-        if focus._type == 'GFField':
-          try:
-            focus = focus._entryList[0]
-          except KeyError:
-            raise "setFocus failed: GFField is not bound to an GFEntry object."
+        try:
+            self.findAndChangeFocus(object._object)
+        finally:
+            self._in_trigger_lock = False
 
-        if not focus._type in ['GFEntry', 'GFButton']:
-          raise "setFocus failed: Can just switch to GFEntry objects. " +\
-                "You passed a '%s' object." % focus._type
-        self._currentEntry.ui_focus_out()
-        self.changeFocus(focus)
-        self._currentEntry.ui_focus_in()
-        self._in_trigger_lock = False
-
     # -------------------------------------------------------------------------
 
     def __trigger_show_message(self, msgtxt, caption='GNUe Message',