Allow Save Settings to save even when AutoSave is turned off

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py
index dc161d603b04898d938536d0e5b336d26f4568ad..371638f60441144fde62dd976dc80a752b5c9356 100644 (file)
--- a/wxPython/wx/py/crust.py
+++ b/wxPython/wx/py/crust.py
@@ -291,17 +291,17 @@ class CrustFrame(frame.Frame, frame.ShellFrameMixin):
             self.crust.LoadSettings(self.config)
 
 
             self.crust.LoadSettings(self.config)
 
 

-    def SaveSettings(self):
+    def SaveSettings(self, force=False):

         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)
         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)

-            if self.autoSaveSettings:
+            if self.autoSaveSettings or force:

                 frame.Frame.SaveSettings(self, self.config)
                 self.crust.SaveSettings(self.config)
 
 
     def DoSaveSettings(self):
         if self.config is not None:
                 frame.Frame.SaveSettings(self, self.config)
                 self.crust.SaveSettings(self.config)
 
 
     def DoSaveSettings(self):
         if self.config is not None:

-            self.SaveSettings()
+            self.SaveSettings(force=True)

             self.config.Flush()
         
 
             self.config.Flush()
         
 

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index a0cdcf88a240fb1f4a845b3d14b27baced3b003e..e45ff175ee2d844ee129894310b24f7de00eb41c 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -106,16 +106,16 @@ class ShellFrame(frame.Frame, frame.ShellFrameMixin):
             frame.Frame.LoadSettings(self, self.config)
             self.shell.LoadSettings(self.config)
 
             frame.Frame.LoadSettings(self, self.config)
             self.shell.LoadSettings(self.config)
 

-    def SaveSettings(self):
+    def SaveSettings(self, force=False):

         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)
         if self.config is not None:
             frame.ShellFrameMixin.SaveSettings(self)

-            if self.autoSaveSettings:
+            if self.autoSaveSettings or force:

                 frame.Frame.SaveSettings(self, self.config)
                 self.shell.SaveSettings(self.config)
 
     def DoSaveSettings(self):
         if self.config is not None:
                 frame.Frame.SaveSettings(self, self.config)
                 self.shell.SaveSettings(self.config)
 
     def DoSaveSettings(self):
         if self.config is not None:

-            self.SaveSettings()
+            self.SaveSettings(force=True)

             self.config.Flush()
         
 
             self.config.Flush()