[gnue] r9335 - in trunk/gnue-forms/src: GFObjects uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2007-01-26 13:44:44 -0600 (Fri, 26 Jan 2007)
New Revision: 9335

Modified:
   trunk/gnue-forms/src/GFObjects/commanders.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
Log:
Changed menu code to match function naming of other objects.


Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py        2007-01-26 17:22:41 UTC 
(rev 9334)
+++ trunk/gnue-forms/src/GFObjects/commanders.py        2007-01-26 19:44:44 UTC 
(rev 9335)
@@ -215,9 +215,9 @@
 
         if new_ui_enabled != self._ui_enabled:
             if new_ui_enabled:
-                self.uiWidget.do_enable()
+                self.uiWidget._ui_enable_()
             else:
-                self.uiWidget.do_disable()
+                self.uiWidget._ui_disable_()
             self._ui_enabled = new_ui_enabled
 
 
@@ -230,12 +230,12 @@
         if self.state and self.__action_off is not None:
             self.__action_off.run()
             self.state = False
-            self.uiWidget.do_switch_off()
+            self.uiWidget._ui_switch_off_()
         elif self.__action is not None:
             self.__action.run()
             if self.__action_off is not None:
                 self.state = True
-                self.uiWidget.do_switch_on()
+                self.uiWidget._ui_switch_on_()
         self.update_status()
 
 

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2007-01-26 
17:22:41 UTC (rev 9334)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2007-01-26 
19:44:44 UTC (rev 9335)
@@ -44,18 +44,24 @@
         Creates a new MenuItem widget.
         """
 
-        if self._gfObject.action_off is not None:
+        # These are the relevant parameters
+        icon = self._gfObject.icon
+        label = self._gfObject.label
+        description = self._gfObject.description
+        check = (self._gfObject.action_off is not None)
+
+        if check:
             kind = wx.ITEM_CHECK
         else:
             kind = wx.ITEM_NORMAL
 
-        if self._gfObject.label is not None:
+        if label is not None:
             widget = wx.MenuItem(event.container, wx.ID_ANY,
-                    self._gfObject.label, self._gfObject.description or u"",
+                    label, description or u"",
                     kind)
     
-            if self._gfObject.icon:
-                image = wx.Image(self._gfObject.icon, wx.BITMAP_TYPE_PNG)
+            if icon:
+                image = wx.Image(icon, wx.BITMAP_TYPE_PNG)
                 widget.SetBitmap(image.ConvertToBitmap())
 
             wx.EVT_MENU(wx.GetApp(), widget.GetId(), self.__on_menu)
@@ -78,7 +84,6 @@
     # -------------------------------------------------------------------------
 
     def __on_menu(self, event):
-
         self._gfObject._event_fire()
 
 
@@ -86,13 +91,13 @@
     # Check/uncheck menu item
     # -------------------------------------------------------------------------
 
-    def do_switch_on(self):
+    def _ui_switch_on_(self):
         if self.__widget is not None:
             self.__widget.Check(True)
 
     # -------------------------------------------------------------------------
 
-    def do_switch_off(self):
+    def _ui_switch_off_(self):
         if self.__widget is not None:
             self.__widget.Check(False)
 
@@ -101,13 +106,13 @@
     # Enable/disable menu item
     # -------------------------------------------------------------------------
 
-    def do_enable(self):
+    def _ui_enable_(self):
         if self.__widget is not None:
             self.__widget.Enable(True)
 
     # -------------------------------------------------------------------------
 
-    def do_disable(self):
+    def _ui_disable_(self):
         if self.__widget is not None:
             self.__widget.Enable(False)