[gnue] r9143 - in trunk/gnue-forms/src: . input/displayHandlers uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2006-12-12 09:31:23 -0600 (Tue, 12 Dec 2006)
New Revision: 9143

Modified:
   trunk/gnue-forms/src/GFConfig.py
   trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
Log:
Further cleanup.


Modified: trunk/gnue-forms/src/GFConfig.py
===================================================================
--- trunk/gnue-forms/src/GFConfig.py    2006-12-12 15:05:41 UTC (rev 9142)
+++ trunk/gnue-forms/src/GFConfig.py    2006-12-12 15:31:23 UTC (rev 9143)
@@ -398,14 +398,6 @@
     'Typecast'   : GTypecast.text,
     'Default'    : 'auto' },
 
-  { 'Name'       : 'dropdownMode',
-    'Type'       : 'Setting',
-    'Comment'    : 'The style of dropdown handler to use for the wx uidriver. 
',
-    'Description': 'The style of dropdown handler to use for the wx uidriver. 
',
-    'Typecast'   : GTypecast.text,
-    'Options'    : ['auto', 'windows', 'gtk1'],
-    'Default'    : 'auto' },
-
   { 'Name'       : 'AsteriskWildcard',
     'Type'       : 'Setting',
     'Comment'    : 'Use asterisk (*) for wildcards in addition to percent (%)',

Modified: trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
15:05:41 UTC (rev 9142)
+++ trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
15:31:23 UTC (rev 9143)
@@ -30,21 +30,4 @@
 from gnue.forms.input.displayHandlers.Cursor import BaseCursor
 
 class Dropdown(BaseCursor):
-  """
-  Class to handle the display and entry of fields that are rendered as style
-  of dropdown.
-  """
-
-  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
-               inputMask):
-
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler,
-            displayMask, inputMask)
-
-    # My events...
-    self.subEventHandler.registerEventListeners( {
-           'requestCOMBODROPPED' : self._comboDropped } )
-
-
-  def _comboDropped(self, event):
-    self.beginEdit()
+    pass

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2006-12-12 15:05:41 UTC 
(rev 9142)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2006-12-12 15:31:23 UTC 
(rev 9143)
@@ -57,20 +57,6 @@
 
     style = object.style
     if style == 'dropdown':
-      if gConfigForms('dropdownMode') == 'auto':
-        if  sys.platform == "win32":
-          self.dropdownMode = 'windows'
-          self.comboHandler = self._windowsComboHandler
-        else:
-          self.dropdownMode = 'gtk1'
-          self.comboHandler = self._gtk1ComboHandler
-      elif gConfigForms('dropdownMode') == 'windows':
-        self.dropdownMode = 'windows'
-        self.comboHandler = self._windowsComboHandler
-      elif gConfigForms('dropdownMode') == 'gtk1':
-        self.dropdownMode = 'gtk1'
-        self.comboHandler = self._gtk1ComboHandler
-
       if event.initialize:
         choices = []
       else:
@@ -82,12 +68,9 @@
         newWidget._origAllowedValues = object._field._allowedValues
         newWidget.SetValue("")
         newWidget_Id = newWidget.GetId()
-        EVT_COMBOBOX(newWidget, newWidget_Id, self.comboHandler)
-        EVT_TEXT(event.container, newWidget_Id, self.comboHandler)
-        EVT_TEXT_ENTER(event.container, newWidget_Id, self.comboHandler)
-        self.comboDropped = True    # True if the combobox is dropped and the 
list is visible.
-                                    # For some strange reason it is best to 
initialize it True as if
-                                    # the list would be dropped down at 
startup, though it is not...
+        EVT_COMBOBOX(newWidget, newWidget_Id, self._comboHandler)
+        EVT_TEXT(event.container, newWidget_Id, self._comboHandler)
+        EVT_TEXT_ENTER(event.container, newWidget_Id, self._comboHandler)
 
     elif style == 'listbox':
       if event.initialize:
@@ -144,55 +127,15 @@
   # --------------------------------------------------------------------------
   # Handles a dropdown's events in Windows mode
   # --------------------------------------------------------------------------
-  def _windowsComboHandler(self, event):
+  def _comboHandler(self, event):
     """
     Handles combobox
-    When combobox list is dropped, we call beginEdit, via event 
requestCOMBODROPPED
-    When a value is selected from the list, we call replaceText, via event 
requestREPLACEVALUE
+    When a value is selected from the list, we call replaceText, via event
+    requestREPLACEVALUE
     """
-    action = None
     eventType = event.GetEventType()
-    if self.comboDropped == True:
-      if eventType in [wxEVT_COMMAND_COMBOBOX_SELECTED,
-                       wxEVT_COMMAND_TEXT_UPDATED,
-                       wxEVT_COMMAND_TEXT_ENTER]:
-        self.comboDropped = False
-
-        object = _eventObjTowxWindow(event)
-        gfObject = self._uiDriver._IdToGFObj[object.GetId()]
-        selection = event.GetSelection()
-
-        action = events.Event('requestREPLACEVALUE',object=gfObject,
-                              index=selection, 
text=wxDecode(event.GetString()),
-                            _form=gfObject._form)
-    else:
-      if eventType in [wxEVT_COMMAND_COMBOBOX_SELECTED,
-                       wxEVT_COMMAND_TEXT_ENTER]:
-        self.comboDropped = True
-
-        object = _eventObjTowxWindow(event)
-        gfObject = self._uiDriver._IdToGFObj[object.GetId()]
-        uiObject = self._uiDriver._IdToUIObj[object.GetId()]
-        action = events.Event('requestCOMBODROPPED', _form=gfObject._form)
-
-    self._eventHandler(action)
-    #event.Skip()   #Is it needed here?
-
-
-  # --------------------------------------------------------------------------
-  # Handles a dropdown's events in GTK1 mode
-  # --------------------------------------------------------------------------
-  def _gtk1ComboHandler(self, event):
-    """
-    Handles combobox for gtk1 style wx.  Unlike the windows handler opening a 
combobox
-    doesn't cause a wxEVT_COMMAND_COMBOBOX_SELECTED event so the widget gets 
confused.
-    """
-    action = None
-    eventType = event.GetEventType()
-    #print "Mode: ", self.dropdownMode
-    #print "Selected: %s\nUpdated: %s\nTextEnter: %s\nEventType %s   -   
DropDown Open? %s " % (wxEVT_COMMAND_COMBOBOX_SELECTED, 
wxEVT_COMMAND_TEXT_UPDATED,                        
wxEVT_COMMAND_TEXT_ENTER,eventType,self.comboDropped)
-
     if eventType in [wxEVT_COMMAND_COMBOBOX_SELECTED,
+                     wxEVT_COMMAND_TEXT_UPDATED,
                      wxEVT_COMMAND_TEXT_ENTER]:
       object = _eventObjTowxWindow(event)
       gfObject = self._uiDriver._IdToGFObj[object.GetId()]
@@ -202,8 +145,7 @@
                             index=selection, text=wxDecode(event.GetString()),
                             _form=gfObject._form)
 
-    self._eventHandler(action)
-    #event.Skip()   #Is it needed here?
+      self._eventHandler(action)
 
 
   # --------------------------------------------------------------------------