[gnue] r9063 - trunk/gnue-forms/src/uidrivers/win32/widgets

[btami]

Author: btami
Date: 2006-11-24 06:12:16 -0600 (Fri, 24 Nov 2006)
New Revision: 9063

Modified:
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
Log:
added _ui_set_choices_() method to win32 too

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-11-24 
10:58:38 UTC (rev 9062)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2006-11-24 
12:12:16 UTC (rev 9063)
@@ -324,7 +324,7 @@
 
                     selection = self.GetValue()
                     if selection >= 0:
-                        string = gfObject._field.allowedValues()[1][selection]
+                        string = uiObject._choices[selection]
                         uiObject._request('REPLACEVALUE',
                                           index=selection, text=string)
 
@@ -337,7 +337,7 @@
                 elif win32api.HIWORD(wParam) == win32con.CBN_SELCHANGE:
                     selection = self.GetValue()
                     if selection >= 0:
-                        string = gfObject._field.allowedValues()[1][selection]
+                        string = uiObject._choices[selection]
                         uiObject._request('REPLACEVALUE',
                                           index=selection, text=string)
                     return win32gui.CallWindowProc(self._oldWndProc, hwnd, 
msg, wParam, lParam)
@@ -373,7 +373,7 @@
             if selection == -1:
                 selection = 0
 
-            string = gfObject._field.allowedValues()[1][selection]
+            string = uiObject._choices[selection]
             uiObject._request('REPLACEVALUE',
                                 index=selection, text=string)
             if lParam == 1:
@@ -528,7 +528,7 @@
                 else:
                     val = win32con.BST_UNCHECKED
                 win32gui.SendMessage(self._hwnd, win32con.BM_SETCHECK, val, 0)
-            elif gfObject.style == 'dropdown':
+            elif gfObject.style == 'dropdown':
                 if value:
                     win32gui.SendMessage(self._hwnd, win32con.CB_SELECTSTRING, 
-1, value)
                 else:
@@ -557,7 +557,7 @@
                 return 1
             else:
                 return 0
-        elif gfObject.style == 'dropdown':
+        elif gfObject.style == 'dropdown':
             return win32gui.SendMessage(self._hwnd, win32con.CB_GETCURSEL, 0, 
0)
         elif gfObject.style == 'listbox':
             return win32gui.SendMessage(self._hwnd, win32con.LB_GETCURSEL, 0, 
0)
@@ -614,7 +614,7 @@
             uiObject = self._uiDriver._IdToUIObj[id]
             if gfObject.style == 'listbox':
                 selection = lbWindow.GetValue()
-                string = gfObject._field.allowedValues()[1][selection]
+                string = uiObject._choices[selection]
                 uiObject._request('REPLACEVALUE',
                                     index=selection, text=string)
 
@@ -756,31 +756,8 @@
 
     def _ui_set_value_(self, index, value):
         widget = self.widgets[index]
-        # Check if foreign key changed
-        gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
-        try:
-            if (gfObject.style == "dropdown" or gfObject.style == "listbox") 
and \
-                not gfObject._field._allowedValues == 
widget._origAllowedValues:
-                widget._origAllowedValues = gfObject._field._allowedValues
-                if gfObject.style == "dropdown":
-                    RESETCONTENT = win32con.CB_RESETCONTENT
-                    ADDSTRING = win32con.CB_ADDSTRING
-                else:
-                    RESETCONTENT = win32con.LB_RESETCONTENT
-                    ADDSTRING = win32con.LB_ADDSTRING
+        widget.SetValue(textEncode(value))
 
-                win32gui.SendMessage(widget.GetHwnd(), RESETCONTENT, 0, 0)
-                for value in gfObject._field.allowedValues()[1]:
-                    win32gui.SendMessage(widget.GetHwnd(), ADDSTRING, 0, 
textEncode(value))
-                widget.SetValue("")
-        except AttributeError:
-            pass
-
-        # display unicode chars properly
-        value=textEncode(value)
-        widget.SetValue(value)
-
-
     def _ui_set_cursor_position_(self, index, position):
         self.widgets[index].set_cursor_position(position)
 

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-24 
10:58:38 UTC (rev 9062)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/entry.py       2006-11-24 
12:12:16 UTC (rev 9063)
@@ -92,23 +92,6 @@
                             height,
                             event.container, getNextId())
 
-        if ostyle == 'dropdown' or ostyle == 'listbox':
-            if event.initialize:
-                choices = object._field.allowedValues()[1]
-            else:
-                choices = [""]
-        
-            if ostyle == 'dropdown':
-                ADDSTRING = win32con.CB_ADDSTRING
-            else:
-                ADDSTRING = win32con.LB_ADDSTRING
-        
-            for item in choices:
-                win32gui.SendMessage(newWidget.GetHwnd(), ADDSTRING, 0, 
textEncode(item))
-            if event.initialize:
-                newWidget._origAllowedValues = object._field._allowedValues
-                newWidget.SetValue("")
-
         return newWidget
 
 
@@ -162,7 +145,26 @@
 
         if hasattr(widget, 'SelectAll'):
             widget.SelectAll()
+
+    # 
---------------------------------------------------------------------------
 
+    def _ui_set_choices_(self, index, choices):
+
+        widget = self.widgets[index]
+
+        if self._gfObject.style == 'dropdown':
+            RESETCONTENT = win32con.CB_RESETCONTENT
+            ADDSTRING = win32con.CB_ADDSTRING
+        else:
+            RESETCONTENT = win32con.LB_RESETCONTENT
+            ADDSTRING = win32con.LB_ADDSTRING
+
+        win32gui.SendMessage(widget.GetHwnd(), RESETCONTENT, 0, 0)
+        self._choices = []
+        for item in choices:
+            win32gui.SendMessage(widget.GetHwnd(), ADDSTRING, 0, 
textEncode(item))
+            self._choices.append(textEncode(item))
+
 
 configuration = {
     'baseClass'  : UIEntry,