r5468 - in trunk/gnue-forms/src: . uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2004-03-22 13:55:40 -0600 (Mon, 22 Mar 2004)
New Revision: 5468

Modified:
   trunk/gnue-forms/src/GFDisplayHandler.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
Log:
Fixed dropdowns containing non-ASCII characters in allowed value list. At least
for wx.


Modified: trunk/gnue-forms/src/GFDisplayHandler.py
===================================================================
--- trunk/gnue-forms/src/GFDisplayHandler.py    2004-03-22 19:29:04 UTC (rev 
5467)
+++ trunk/gnue-forms/src/GFDisplayHandler.py    2004-03-22 19:55:40 UTC (rev 
5468)
@@ -772,11 +772,11 @@
       for disp in self.field._allowedValuesDescr:
         if string.lower(disp[:len(val)]) == val:
           display = 
self.field._allowedValues[self.field._allowedValuesReverse[disp]]
-          return str(display)
-      return str(value)
+          return display
+      return value
 
-    if self.field._allowedValues.has_key(str(value)):
-      return self.field._allowedValues[str(value)]
+    if self.field._allowedValues.has_key(value):
+      return self.field._allowedValues[value]
     else:
       return ""
 

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-03-22 19:29:04 UTC 
(rev 5467)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2004-03-22 19:55:40 UTC 
(rev 5468)
@@ -31,7 +31,7 @@
 from types import UnicodeType
 
 from gnue.forms.uidrivers.wx.widgets._base import UIHelper
-from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow, wxEncode
+from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow, wxEncode, 
wxDecode
 from gnue.forms.uidrivers.wx.common import _setDefaultEventHandlers
 
 #
@@ -129,7 +129,7 @@
         selection = event.GetSelection()
 
         action = events.Event('requestREPLACEVALUE',object=gfObject,
-                              index=selection, text=event.GetString(),
+                              index=selection, 
text=wxDecode(event.GetString()),
                             _form=gfObject._form)
     else:
       if eventType in 
[wxEVT_COMMAND_COMBOBOX_SELECTED,wxEVT_COMMAND_TEXT_ENTER]: