r6687 - trunk/gnue-forms/src/uidrivers/gtk2/widgets/form

[johannes]

Author: johannes
Date: 2004-11-17 10:01:37 -0600 (Wed, 17 Nov 2004)
New Revision: 6687

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
Log:
Place the focus correctly on paged forms and dialogs


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-11-17 
11:14:07 UTC (rev 6686)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-11-17 
16:01:37 UTC (rev 6687)
@@ -223,8 +223,13 @@
   # ---------------------------------------------------------------------------
 
   def show (self):
-    self.containerFrame.show ()
+    widget = self.mainWindow.get_focus ()
+
     self.mainWindow.show_all ()
+
+    if widget != self.mainWindow.get_focus ():
+      widget.grab_focus ()
+
     self._visible = 1
     if self._form.style == 'dialog':
       self.mainWindow.run ()
@@ -246,8 +251,14 @@
   # ---------------------------------------------------------------------------
 
   def showModal (self):
+    widget = self.mainWindow.get_focus ()
+
     self.mainWindow.show_all ()
     self.mainWindow.set_modal (True)
+
+    if widget != self.mainWindow.get_focus ():
+      widget.grab_focus ()
+
     self._visible = 1
     if self._form.style == 'dialog':
       self.mainWindow.run ()