Integrated fixes for sizing/positioning; cleanup; removal of handle/window

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

diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py
index e716fb7492a922a3a736af23c8cffd00e148d369..b74d6521234918e4c43c13e154aa30b106d714f8 100644 (file)
--- a/wxPython/wx/py/frame.py
+++ b/wxPython/wx/py/frame.py
@@ -544,6 +544,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 +553,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: