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

[reinhard]

Author: reinhard
Date: 2006-06-22 09:21:45 -0500 (Thu, 22 Jun 2006)
New Revision: 8507

Modified:
   trunk/gnue-forms/src/GFObjects/commanders.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
Log:
Also use event_begin and event_end in commanders.

issue79 in-progress


Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 09:42:48 UTC 
(rev 8506)
+++ trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 14:21:45 UTC 
(rev 8507)
@@ -141,31 +141,6 @@
 
 
     # -------------------------------------------------------------------------
-    # Trigger functions
-    # -------------------------------------------------------------------------
-
-    def __trigger_get_state(self):
-        return self.state
-
-    # -------------------------------------------------------------------------
-
-    def __trigger_set_state(self, value):
-        if value != self.state:
-            self.fire()
-
-    # -------------------------------------------------------------------------
-
-    def __trigger_get_enabled(self):
-        return self.enabled
-
-    # -------------------------------------------------------------------------
-
-    def __trigger_set_enabled(self, value):
-        self.enabled = value
-        self.update_status()
-
-
-    # -------------------------------------------------------------------------
     # Update enabled/disabled status
     # -------------------------------------------------------------------------
 
@@ -194,13 +169,16 @@
 
 
     # -------------------------------------------------------------------------
-    # Fire the commander
+    # User Events
     # -------------------------------------------------------------------------
 
-    def fire(self):
+    def _event_fire(self):
         """
         Fire the commander.
 
+        This function is executed when the user clicks on the menu item or the
+        toolbar button.
+
         If the commander is bound to a single action, this action is executed.
         
         If the commander is bound to two actions (i.e. it is a toggle), the
@@ -208,6 +186,44 @@
         executed.
         """
 
+        self._form.event_begin()
+        try:
+            self.__fire()
+        finally:
+            self._form.event_end()
+
+
+    # -------------------------------------------------------------------------
+    # Trigger functions
+    # -------------------------------------------------------------------------
+
+    def __trigger_get_state(self):
+        return self.state
+
+    # -------------------------------------------------------------------------
+
+    def __trigger_set_state(self, value):
+        if value != self.state:
+            self.__fire()
+
+    # -------------------------------------------------------------------------
+
+    def __trigger_get_enabled(self):
+        return self.enabled
+
+    # -------------------------------------------------------------------------
+
+    def __trigger_set_enabled(self, value):
+        self.enabled = value
+        self.update_status()
+
+
+    # -------------------------------------------------------------------------
+    # Fire the commander
+    # -------------------------------------------------------------------------
+
+    def __fire(self):
+
         if self.state and self.__action_off is not None:
             self.__action_off.run()
             self.state = False

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2006-06-22 
09:42:48 UTC (rev 8506)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2006-06-22 
14:21:45 UTC (rev 8507)
@@ -79,7 +79,7 @@
 
     def __on_menu(self, event):
 
-        self._gfObject.fire()
+        self._gfObject._event_fire()
 
 
     # -------------------------------------------------------------------------