r6445 - trunk/gnue-forms/src/uidrivers/win32/widgets

[btami]

Author: btami
Date: 2004-10-01 07:26:20 -0500 (Fri, 01 Oct 2004)
New Revision: 6445

Modified:
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
Log:
fixed not correct handling of empty string as current selection in dropdowns

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-10-01 
11:24:46 UTC (rev 6444)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-10-01 
12:26:20 UTC (rev 6445)
@@ -345,10 +345,16 @@
         else:
           val = win32con.BST_UNCHECKED
         win32gui.SendMessage(self._hwnd, win32con.BM_SETCHECK, val, 0)
-      elif gfObject.style == 'dropdown':
-        win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, -1, value) 
# CB_SETCURSEL, value, 0)
+      elif gfObject.style == 'dropdown':
+        if value:
+          win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, -1, value)
+        else:
+          win32gui.SendMessage(self._hwnd, win32con.CB_SETCURSEL, 0, 0)
       elif gfObject.style == 'listbox':
-        win32gui.SendMessage(self._hwnd, win32con.LB_SELECTSTRING, -1, value)
+        if value:
+          win32gui.SendMessage(self._hwnd, win32con.LB_SELECTSTRING, -1, value)
+        else:
+          win32gui.SendMessage(self._hwnd, win32con.LB_SETCURSEL, 0, 0)
       else:
         if hasattr(gfObject,'Char__height') and gfObject.Char__height > 1:
           corrvalue = re.sub(r'(?<!\r)\n', r'\r\n', value)
@@ -498,7 +504,6 @@
 
   def setValue(self, value, index=0, enabled=1):
     widget = self.widgets[index]
-
     # Check if foreign key changed
     gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
     try:
@@ -513,7 +518,7 @@
           ADDSTRING = LB_ADDSTRING
 
         win32gui.SendMessage(widget.GetHwnd(), RESETCONTENT, 0, 0)
-        for value in gfObject._field.allowedValues()[1]:
+        for value in gfObject._field.allowedValues()[1]:
           win32gui.SendMessage(widget.GetHwnd(), ADDSTRING, 0, 
textEncode(value.encode))
         widget.SetValue("")
     except AttributeError: