[gnue] r8851 - trunk/gnue-forms/src/uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2006-10-18 10:01:21 -0500 (Wed, 18 Oct 2006)
New Revision: 8851

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
Log:
_block_focus_ not necessary any more after focus cleanup.


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-18 
14:42:29 UTC (rev 8850)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/_base.py        2006-10-18 
15:01:21 UTC (rev 8851)
@@ -65,9 +65,7 @@
         self.label = None
         self.widget = None
 
-        self._block_focus_ = False
 
-
     # -------------------------------------------------------------------------
     # Get the best size of a widget
     # -------------------------------------------------------------------------
@@ -126,16 +124,12 @@
             if sizer:
                 sizer.Layout()
 
-        current = widget.FindFocus()
-
         if isinstance(widget, wx.ComboBox) and 'wxMac' in wx.PlatformInfo:
             item = widget._entry
         else:
             item = widget
 
-        # Only change the focus if necessary
-        if current != item and not self._block_focus_:
-            item.SetFocus()
+        item.SetFocus()
 
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-10-18 
14:42:29 UTC (rev 8850)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-10-18 
15:01:21 UTC (rev 8851)
@@ -394,13 +394,8 @@
             restore = None
 
         if do_focus:
-            try:
-                self._block_focus_ = True
-                self._request('FOCUS', data=self._gfObject)
+            self._request('FOCUS', data=self._gfObject)
 
-            finally:
-                self._block_focus_ = False
-
         if adjust:
             self._request('JUMPRECORD', data=adjust)