[gnue] r7988 - in trunk/gnue-forms/src/uidrivers/win32: . widgets

[btami]

Author: btami
Date: 2005-09-24 12:04:40 -0500 (Sat, 24 Sep 2005)
New Revision: 7988

Modified:
   trunk/gnue-forms/src/uidrivers/win32/ToolBar.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
Log:
close up the dropdown's listbox part after selection with mouse

Modified: trunk/gnue-forms/src/uidrivers/win32/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/ToolBar.py     2005-09-24 13:27:58 UTC 
(rev 7987)
+++ trunk/gnue-forms/src/uidrivers/win32/ToolBar.py     2005-09-24 17:04:40 UTC 
(rev 7988)
@@ -112,17 +112,15 @@
               tb=parent.GetHwnd(),
               f=self.form: l.dispatchEvent(
                   (win32gui.SendMessage(tb, commctrl.TB_ISBUTTONCHECKED, id, 
0) and e or te),_form=f))
+      check = 1
+      style = commctrl.TBSTYLE_CHECK
+
     else:
       self.container.Connect(id, 
         lambda l=self.driver, e=event, f=self.form: l.dispatchEvent(e,_form=f))
-
-    if userAction.canToggle:
-      check = 1
-      style = commctrl.TBSTYLE_CHECK
-    else:
       check = 0
       style = commctrl.TBSTYLE_BUTTON
-    
+
 #    TBBUTTON stru (iBitmap, idCommand, fsState, fsStyle, dwData, iString)
     tbb=struct.pack("iibbli", self._buttonCount, id, commctrl.TBSTATE_ENABLED, 
style, 0, 0)
     win32gui.SendMessage(parent.GetHwnd(), commctrl.TB_ADDBUTTONS, 1, tbb)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2005-09-24 
13:27:58 UTC (rev 7987)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2005-09-24 
17:04:40 UTC (rev 7988)
@@ -101,9 +101,11 @@
     if msg == win32con.WM_KEYDOWN:
       keycode = wParam
       self._AutoComplete = True
+      
       # let the delete/back keys do their job
       if keycode in (win32con.VK_DELETE, win32con.VK_BACK):
         self._AutoComplete = False
+        
       elif keycode == win32con.VK_TAB:
         # we have to deal with tab and enter
         ShiftDown = (win32api.GetKeyState(win32con.VK_SHIFT) & 0x8000) and 1 
or 0
@@ -112,6 +114,7 @@
         else:
           win32gui.SendMessage(self._hwnd, WM_TAB, 0, 0)
         return 0
+        
       elif keycode == win32con.VK_RETURN:
         win32gui.SendMessage(self._hwnd, WM_RETURN, 0, 0)
         return 0
@@ -305,6 +308,7 @@
             uiObject._eventHandler('requestREPLACEVALUE',object=gfObject,
                               index=selection, text=string,
                             _form=gfObject._form)
+          return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
         else:
           return win32gui.CallWindowProc(self._oldWndProc, hwnd, msg, wParam, 
lParam)
       else: