[gnue] r6890 - in trunk/gnue-forms/src/uidrivers: win32 wx

[btami]

Author: btami
Date: 2005-01-11 02:17:00 -0600 (Tue, 11 Jan 2005)
New Revision: 6890

Modified:
   trunk/gnue-forms/src/uidrivers/win32/MenuBar.py
   trunk/gnue-forms/src/uidrivers/wx/MenuBar.py
Log:
fixed unicode label handling in wx and win32 menubar

Modified: trunk/gnue-forms/src/uidrivers/win32/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/MenuBar.py     2005-01-10 23:20:42 UTC 
(rev 6889)
+++ trunk/gnue-forms/src/uidrivers/win32/MenuBar.py     2005-01-11 08:17:00 UTC 
(rev 6890)
@@ -28,7 +28,7 @@
 import string
 import win32api, win32gui, win32ui, win32con, commctrl
 from gnue.forms.uidrivers._commonGuiToolkit.MenuBar import MenuBar as 
_BaseMenuBar
-from gnue.forms.uidrivers.win32.common import getNextId
+from gnue.forms.uidrivers.win32.common import getNextId, textEncode
 from gnue.common.apps import GDebug
 from gnue.common import events
 
@@ -45,7 +45,7 @@
   # Add a (sub)menu
   def addMenu(self, name, parent):
     menu = win32ui.CreatePopupMenu()
-    parent.AppendMenu(_menustyle | win32con.MF_POPUP, menu.GetHandle(), name )
+    parent.AppendMenu(_menustyle | win32con.MF_POPUP, menu.GetHandle(), 
textEncode(name))
     # One would think this would go in init(),
     # but, no... win32 has to be a jerkoff.
     win32gui.SetMenu(self.container.GetHwnd(), self._hmnu )
@@ -70,7 +70,7 @@
 
     id = getNextId()
     self.container.addDescription(id, userAction.description or '')
-    parent.AppendMenu(_menustyle, id, label)
+    parent.AppendMenu(_menustyle, id, textEncode(label))
     event = 'request' + userAction.event
     self.container.Connect(id, lambda l=self.driver, e=event, f=self.form: 
l.dispatchEvent(events.Event(e,_form=f)))
 

Modified: trunk/gnue-forms/src/uidrivers/wx/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/MenuBar.py        2005-01-10 23:20:42 UTC 
(rev 6889)
+++ trunk/gnue-forms/src/uidrivers/wx/MenuBar.py        2005-01-11 08:17:00 UTC 
(rev 6890)
@@ -45,9 +45,9 @@
     menu = wxMenu()
     id = wxNewId()
     if parent == self.menu:
-      parent.Append(menu, name)
+      parent.Append(menu, wxEncode(name))
     else:
-      parent.AppendMenu(id, name, menu)
+      parent.AppendMenu(id, wxEncode(name), menu)
 
     return menu