r13841 - /branches/gui_testing/gui/menu.py -- July 22, 2011 - 19:58

Author: bugman
Date: Fri Jul 22 19:58:36 2011
New Revision: 13841

URL: http://svn.gna.org/viewcvs/relax?rev=13841&view=rev
Log:
Reverted r13840 as the 'Window' menu on a Mac is actually quite useful for 
relax!

The command used was:
svn merge -r13840:13839 .

.....
  r13840 | bugman | 2011-07-22 19:51:42 +0200 (Fri, 22 Jul 2011) | 3 lines
  Changed paths:
     M /branches/gui_testing/gui/menu.py
  
  The window menu has been disabled on Mac OS X.
.....


Modified:
    branches/gui_testing/gui/menu.py

Modified: branches/gui_testing/gui/menu.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/menu.py?rev=13841&r1=13840&r2=13841&view=diff
==============================================================================
--- branches/gui_testing/gui/menu.py (original)
+++ branches/gui_testing/gui/menu.py Fri Jul 22 19:58:36 2011
@@ -46,9 +46,7 @@
 
         # Create the menu bar GUI item and add it to the main frame.
         self.menubar = wx.MenuBar()
-
-        # Disable the 'Window' menu entry on Mac OS X.
-        self.menubar.SetAutoWindowMenu(False)
+        self.gui.SetMenuBar(self.menubar)
 
         # The 'File' menu entries.
         menu = wx.Menu()
@@ -118,9 +116,6 @@
         self.gui.Bind(wx.EVT_MENU, self.gui.references,     id=42)
         self.gui.Bind(wx.EVT_MENU, self.gui.about_gui,      id=43)
         self.gui.Bind(wx.EVT_MENU, self.gui.about_relax,    id=44)
-
-        # Add the menu bar to the GUI.
-        self.gui.SetMenuBar(self.menubar)
 
         # Menu update.
         self.gui.Bind(wx.EVT_MENU_OPEN, self.update_menus)