[gnue] r9360 - trunk/gnue-forms/src/uidrivers/wx

[reinhard]

Author: reinhard
Date: 2007-02-08 13:34:22 -0600 (Thu, 08 Feb 2007)
New Revision: 9360

Modified:
   trunk/gnue-forms/src/uidrivers/wx/ToolBar.py
Log:
Fixed ToolBar for wx driver.


Modified: trunk/gnue-forms/src/uidrivers/wx/ToolBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/ToolBar.py        2007-02-08 17:20:28 UTC 
(rev 9359)
+++ trunk/gnue-forms/src/uidrivers/wx/ToolBar.py        2007-02-08 19:34:22 UTC 
(rev 9360)
@@ -74,11 +74,12 @@
       return
 
 
-    self.toolbar.AddSimpleTool(id, icon, wxEncode(userAction.description) or 
'',
-                               isToggle=(userAction.canToggle and 1 or 0))
+    result = self.toolbar.AddSimpleTool(id, icon,
+            wxEncode(userAction.description) or '',
+            isToggle=(userAction.canToggle and 1 or 0))
 
     self.toolbar.Realize()
-    return id
+    return result
 
 
   # Add a separator
@@ -88,20 +89,20 @@
   # Enable a menu item
   def enableItem(self, item):
     if item != None:
-      self.toolbar.EnableTool(item, 1)
+      self.toolbar.EnableTool(item.GetId(), 1)
 
   # Disable a menu item
   def disableItem(self, item):
     if item != None:
-      self.toolbar.EnableTool(item, 0)
+      self.toolbar.EnableTool(item.GetId(), 0)
 
   def startingItem(self, item):
     if item!=None:
-      self.toolbar.ToggleTool(item,1)
+      self.toolbar.ToggleTool(item.GetId(),1)
 
   def endingItem(self, item):
     if item!=None:
-      self.toolbar.ToggleTool(item,0)
+      self.toolbar.ToggleTool(item.GetId(),0)
 
 
 _cachedIcons = {}