[gnue] r9369 - trunk/gnue-forms/src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2007-02-09 11:36:44 -0600 (Fri, 09 Feb 2007)
New Revision: 9369

Modified:
   trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py
Log:
Fixes in menu and toolbar for wx2.4.

issue79 in-progress


Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py       2007-02-09 
17:29:58 UTC (rev 9368)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/menuitem.py       2007-02-09 
17:36:44 UTC (rev 9369)
@@ -61,14 +61,16 @@
                 text = label + u"\t" + hotkey
             else:
                 text = label
-            widget = wx.MenuItem(event.container, wx.ID_ANY, text,
+
+            self.__id = wx.NewId()
+            widget = wx.MenuItem(event.container, self.__id, text,
                     description or u"", kind)
     
             if icon_file and not check:
                 image = wx.Image(icon_file, wx.BITMAP_TYPE_PNG)
                 widget.SetBitmap(image.ConvertToBitmap())
 
-            wx.EVT_MENU(wx.GetApp(), widget.GetId(), self.__on_menu)
+            wx.EVT_MENU(wx.GetApp(), self.__id, self.__on_menu)
 
             event.container.AppendItem(widget)
         else:

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py     2007-02-09 
17:29:58 UTC (rev 9368)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/toolbutton.py     2007-02-09 
17:36:44 UTC (rev 9369)
@@ -61,11 +61,13 @@
             else:
                 image = None
 
-            widget = event.container.AddLabelTool(wx.ID_ANY, label,
+            self.__toolbar = event.container
+            self.__id = wx.NewId()
+            widget = event.container.AddLabelTool(self.__id, label,
                     image.ConvertToBitmap(), kind=kind, shortHelp=label,
                     longHelp=(description or u""))
 
-            wx.EVT_TOOL(event.container, widget.GetId(), self.__on_tool)
+            wx.EVT_TOOL(event.container, self.__id, self.__on_tool)
         else:
             widget = None
             event.container.AddSeparator()
@@ -89,13 +91,13 @@
 
     def _ui_switch_on_(self):
         if self.__widget is not None:
-            self.__widget.GetToolBar().ToggleTool(self.__widget.GetId(), True)
+            self.__toolbar.ToggleTool(self.__id, True)
 
     # -------------------------------------------------------------------------
 
     def _ui_switch_off_(self):
         if self.__widget is not None:
-            self.__widget.GetToolBar().ToggleTool(self.__widget.GetId(), False)
+            self.__toolbar.ToggleTool(self.__id, False)
 
 
     # -------------------------------------------------------------------------
@@ -104,13 +106,13 @@
 
     def _ui_enable_(self):
         if self.__widget is not None:
-            self.__widget.GetToolBar().EnableTool(self.__widget.GetId(), True)
+            self.__toolbar.EnableTool(self.__id, True)
 
     # -------------------------------------------------------------------------
 
     def _ui_disable_(self):
         if self.__widget is not None:
-            self.__widget.GetToolBar().EnableTool(self.__widget.GetId(), False)
+            self.__toolbar.EnableTool(self.__id, False)
 
 
 # =============================================================================