Applied patch [ 1407318 ] bitmap clipping / transparency mask (X11 port)

[wxWidgets.git] / wxPython / wx / py / frame.py

diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py
index e716fb7492a922a3a736af23c8cffd00e148d369..fcdb14c85ebec1e0180d1ad53f77929f3ff9f465 100644 (file)
--- a/wxPython/wx/py/frame.py
+++ b/wxPython/wx/py/frame.py
@@ -176,26 +176,37 @@ class Frame(wx.Frame):
                      'Call Tip Options')
                 
         if wx.Platform == "__WXMAC__":
                      'Call Tip Options')
                 
         if wx.Platform == "__WXMAC__":

-            m.Append(ID_USEAA, '&Use AntiAliasing\tCtrl+Shift+A',
+            m.Append(ID_USEAA, '&Use AntiAliasing',

                      'Use anti-aliased fonts', wx.ITEM_CHECK)
             
         m.AppendSeparator()
                      'Use anti-aliased fonts', wx.ITEM_CHECK)
             
         m.AppendSeparator()

-        m.Append(ID_SAVEHISTORY, '&Save History\tAlt+Ctrl+A', 'Automatically save history on close', wx.ITEM_CHECK)
+        m.Append(ID_SAVEHISTORY, '&Save History',
+                 'Automatically save history on close', wx.ITEM_CHECK)

         self.startupMenu = wx.Menu()
         self.startupMenu = wx.Menu()

-        self.startupMenu.Append(ID_EXECSTARTUPSCRIPT, 'E&xecute Startup Script\tAlt+Ctrl+X', 'Execute Startup Script', wx.ITEM_CHECK)
-        self.startupMenu.Append(ID_EDITSTARTUPSCRIPT, '&Edit Startup Script\tAlt+Ctrl+E', 'Edit Startup Script')
+        self.startupMenu.Append(ID_EXECSTARTUPSCRIPT,
+                                'E&xecute Startup Script',
+                                'Execute Startup Script', wx.ITEM_CHECK)
+        self.startupMenu.Append(ID_EDITSTARTUPSCRIPT,
+                                '&Edit Startup Script',
+                                'Edit Startup Script')

         m.AppendMenu(ID_STARTUP, '&Startup', self.startupMenu, 'Startup Options')
 
         self.settingsMenu = wx.Menu()
         m.AppendMenu(ID_STARTUP, '&Startup', self.startupMenu, 'Startup Options')
 
         self.settingsMenu = wx.Menu()

-        self.settingsMenu.Append(ID_AUTO_SAVESETTINGS, '&Auto Save Settings\tAlt+Ctrl+A', 'Automatically save settings on close', wx.ITEM_CHECK)
-        self.settingsMenu.Append(ID_SAVESETTINGS, '&Save Settings\tAlt+Ctrl+S', 'Save settings now')
-        self.settingsMenu.Append(ID_DELSETTINGSFILE, '&Revert to default\tAlt+Ctrl+R', 'Revert to the default settings')
+        self.settingsMenu.Append(ID_AUTO_SAVESETTINGS,
+                                 '&Auto Save Settings',
+                                 'Automatically save settings on close', wx.ITEM_CHECK)
+        self.settingsMenu.Append(ID_SAVESETTINGS,
+                                 '&Save Settings',
+                                 'Save settings now')
+        self.settingsMenu.Append(ID_DELSETTINGSFILE,
+                                 '&Revert to default',
+                                 'Revert to the default settings')

         m.AppendMenu(ID_SETTINGS, '&Settings', self.settingsMenu, 'Settings Options')           
 
         m = self.helpMenu = wx.Menu()
         m.Append(ID_HELP, '&Help\tF1', 'Help!')
         m.AppendSeparator()
         m.AppendMenu(ID_SETTINGS, '&Settings', self.settingsMenu, 'Settings Options')           
 
         m = self.helpMenu = wx.Menu()
         m.Append(ID_HELP, '&Help\tF1', 'Help!')
         m.AppendSeparator()

-        m.Append(ID_ABOUT, '&About...\tAlt+A', 'About this program')
+        m.Append(ID_ABOUT, '&About...', 'About this program')

 
         b = self.menuBar = wx.MenuBar()
         b.Append(self.fileMenu, '&File')
 
         b = self.menuBar = wx.MenuBar()
         b.Append(self.fileMenu, '&File')


@@ -544,6 +555,7 @@ class Frame(wx.Frame):
                 event.Check(win.lineNumbers)
             elif id == ID_AUTO_SAVESETTINGS:
                 event.Check(self.autoSaveSettings)
                 event.Check(win.lineNumbers)
             elif id == ID_AUTO_SAVESETTINGS:
                 event.Check(self.autoSaveSettings)

+                event.Enable(self.config is not None)

             elif id == ID_SAVESETTINGS:
                 event.Enable(self.config is not None and
                              hasattr(self, 'DoSaveSettings'))
             elif id == ID_SAVESETTINGS:
                 event.Enable(self.config is not None and
                              hasattr(self, 'DoSaveSettings'))


@@ -552,12 +564,15 @@ class Frame(wx.Frame):
                 
             elif id == ID_EXECSTARTUPSCRIPT:
                 event.Check(self.execStartupScript)
                 
             elif id == ID_EXECSTARTUPSCRIPT:
                 event.Check(self.execStartupScript)

+                event.Enable(self.config is not None)

 
             elif id == ID_SAVEHISTORY:
 
             elif id == ID_SAVEHISTORY:

-                event.Check(self.saveHistory and self.dataDir is not None)
+                event.Check(self.saveHistory)
+                event.Enable(self.dataDir is not None)

             elif id == ID_EDITSTARTUPSCRIPT:
                 event.Enable(hasattr(self, 'EditStartupScript'))
             elif id == ID_EDITSTARTUPSCRIPT:
                 event.Enable(hasattr(self, 'EditStartupScript'))

-
+                event.Enable(self.dataDir is not None)
+                

             elif id == ID_FIND:
                 event.Enable(hasattr(win, 'DoFindNext'))
             elif id == ID_FINDNEXT:
             elif id == ID_FIND:
                 event.Enable(hasattr(win, 'DoFindNext'))
             elif id == ID_FINDNEXT: