r6072 - trunk/gnue-forms/src/uidrivers/gtk2/widgets

[johannes]

Author: johannes
Date: 2004-07-24 14:28:16 -0500 (Sat, 24 Jul 2004)
New Revision: 6072

Modified:
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
Log:
Now the combo should really work fine :)


Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-24 
18:25:43 UTC (rev 6071)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/_base.py        2004-07-24 
19:28:16 UTC (rev 6072)
@@ -248,13 +248,11 @@
         
       self._blockHandler (widget.entry, '_insert_handler')
       self._blockHandler (widget.entry, '_delete_handler')
-      self._blockHandler (widget.list , '_selectHandler')
 
       widget.entry.set_text (value)
 
       self._blockHandler (widget.entry, '_insert_handler', True)
       self._blockHandler (widget.entry, '_delete_handler', True)
-      self._blockHandler (widget.list , '_selectHandler' , True)
 
 
       

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-24 
18:25:43 UTC (rev 6071)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py        2004-07-24 
19:28:16 UTC (rev 6072)
@@ -22,6 +22,7 @@
 # $Id$
 
 import gtk
+import math
 
 from gnue.common import events
 from gnue.forms.uidrivers.gtk2.widgets._base import UIHelper
@@ -64,6 +65,9 @@
   def __createDropDown (self, gfObject, event):
     newWidget = gtk.Combo ()
     newWidget.entry.modify_font (self._uiDriver.font)
+    maxLen = hasattr (gfObject, 'maxLength') and gfObject.maxLength or 0
+    newWidget.entry.set_max_length (maxLen)
+    
     newWidget._origAllowedValues = None
     self._updateChoices (newWidget, gfObject)
 
@@ -88,10 +92,6 @@
                                              self.deleteTextHandler,
                                              gfObject)
 
-      newWidget.list._selectHandler = newWidget.list.connect ('select-child',
-                                                  self.comboHandler,
-                                                  newWidget)
-
     return newWidget
 
 
@@ -363,37 +363,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Handle selection event in combo boxes
-  # ---------------------------------------------------------------------------
-
-  def comboHandler (self, comboList, listChild, combo):
-    """
-    This function handles a 'select-child' signal of a combo box list. If the
-    newly selected item differs from the corresponding GFObject's value a
-    'requestREPLACEVALUE' will be fired.
-    """
-    gfObject      = self._uiDriver._WidgetToGFObj [combo]
-    selection     = comboList.child_position (listChild)
-    compare       = self.reverse.get (gfObject.getValue (), None)
-    selected_text = self.choices [selection]
-    
-    gDebug (1, "Old %s vs %s" % (repr(compare), repr(selected_text)))
-      
-    comboList.stop_emission ('select-child')
-
-    # if compare != selected_text:
-    if gfObject._displayHandler.display != selected_text:
-      gDebug (1, "Replacing value %s %s" % (repr(compare), 
repr(selected_text)))
-      action = events.Event ('requestREPLACEVALUE', object = gfObject,
-                            index = selection, text = selected_text,
-                            _form = gfObject._form)
-
-      self._eventHandler (action)
-
-    return gtk.TRUE
-
-
-  # ---------------------------------------------------------------------------
   # Handle the toggled event on a checkbox
   # ---------------------------------------------------------------------------
 
@@ -429,9 +398,7 @@
       self.choices.sort ()
 
       combo._origAllowedValues = gfObject._field._allowedValues
-      self._blockHandler (combo.list, '_selectHandler')
       combo.set_popdown_strings (self.choices)
-      self._blockHandler (combo.list, '_selectHandler', True)
 
 
 # -----------------------------------------------------------------------------