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

[johannes]

Author: johannes
Date: 2006-01-27 03:45:09 -0600 (Fri, 27 Jan 2006)
New Revision: 8143

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
Log:
Only send a requestFOCUS a widget is not the current one; use the proper 
selection marks for dropdowns now


Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-01-27 
09:19:03 UTC (rev 8142)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/entry.py        2006-01-27 
09:45:09 UTC (rev 8143)
@@ -109,13 +109,14 @@
 
   def __setFocus (self, event):
 
-    self._request ('FOCUS', data = self._gfObject)
+    if self._form._currentEntry != self._gfObject:
+      self._request ('FOCUS', data = self._gfObject)
 
-    # adjust the record number if necessary
-    count  = self.widgets.index (event.GetEventObject ())
-    adjust = count - self._gfObject._visibleIndex
-    if adjust:
-      self._request ('JUMPRECORD', data = adjust)
+      # adjust the record number if necessary
+      count  = self.widgets.index (event.GetEventObject ())
+      adjust = count - self._gfObject._visibleIndex
+      if adjust:
+        self._request ('JUMPRECORD', data = adjust)
 
     event.Skip ()
 
@@ -132,8 +133,7 @@
       (left, right) = widget.GetSelection ()
 
     elif isinstance (widget, wx.ComboBox):
-      # FIXME: check why widget.GetMark () returns useless values !?!
-      left = right = widget.GetInsertionPoint ()
+      (left, right) = widget.GetMark ()
 
     if left == right:
       self._request ('CURSORMOVE', position = left)