X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/488256e0a1b3c8667e71dd12749cc7705256ba80..32485259c1342115488d219776dfebeb3d4d81b1:/wxPython/src/_app_ex.py

diff --git a/wxPython/src/_app_ex.py b/wxPython/src/_app_ex.py
index e630afa6f4..f08eef9f41 100644
--- a/wxPython/src/_app_ex.py
+++ b/wxPython/src/_app_ex.py
@@ -165,17 +165,21 @@ your Mac."""
         if redirect:
             self.RedirectStdio(filename)
 
+        # Use Python's install prefix as the default  
+        wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix)
+
         # This finishes the initialization of wxWindows and then calls
         # the OnInit that should be present in the derived class
         self._BootstrapApp()
 
 
-    def __del__(self):
-        try:
-            self.RestoreStdio()  # Just in case the MainLoop was overridden
-        except:
-            pass
+    def __del__(self, destroy=wx.PyApp.__del__):
+        self.RestoreStdio()  # Just in case the MainLoop was overridden
+        destroy(self)
 
+    def Destroy(self):
+        wx.PyApp.Destroy(self)
+        self.thisown = 0
 
     def SetTopWindow(self, frame):
         """Set the \"main\" top level window"""
@@ -200,13 +204,17 @@ your Mac."""
 
 
     def RestoreStdio(self):
-        _sys.stdout, _sys.stderr = self.saveStdio
+        try:
+            _sys.stdout, _sys.stderr = self.saveStdio
+        except:
+            pass
 
 
     def SetOutputWindowAttributes(self, title=None, pos=None, size=None):
         """
         Set the title, position and/or size of the output window if
-        the stdio has been redirected.
+        the stdio has been redirected.  This should be called before
+        any output would cause the output window to be created.
         """
         if self.stdioWin:
             if title is not None: