[gnue] r9439 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2007-03-12 08:54:20 -0500 (Mon, 12 Mar 2007)
New Revision: 9439

Modified:
   trunk/gnue-forms/src/GFForm.py
Log:
Always merge in default menu and toolbar definition.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2007-03-12 12:39:34 UTC (rev 9438)
+++ trunk/gnue-forms/src/GFForm.py      2007-03-12 13:54:20 UTC (rev 9439)
@@ -284,16 +284,18 @@
 
     def initialize(self, default_form):
 
-        # FIXME: for now, only merge standard menu if there is a menu defined
-        # in the form. Do all of this unconditionally after menu handling is
-        # finished.
-        if self.findChildNamed('__extra_menu__', 'GFMenu'):
-            self.merge(default_form)
-            # Merge extras and help menus into the main menu
-            main_menu = self.findChildNamed('__main_menu__', 'GFMenu')
-            main_menu.merge(self.findChildNamed('__extra_menu__', 'GFMenu'))
-            main_menu.merge(self.findChildNamed('__help_menu__', 'GFMenu'))
+        # Merge in default menu and toolbar.
+        self.merge(default_form)
 
+        # Merge extras and help menus into the main menu.
+        main_menu = self.findChildNamed('__main_menu__', 'GFMenu')
+        extra_menu = self.findChildNamed('__extra_menu__', 'GFMenu')
+        help_menu = self.findChildNamed('__help_menu__', 'GFMenu')
+        if extra_menu:
+            main_menu.merge(extra_menu)
+        if help_menu:
+            main_menu.merge(help_menu)
+
         self.phaseInit()
 
         for subform in self.__subforms.itervalues():