Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / utils / wxPython / src / _extras.py

diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py
index 53cb1132af3480e8c5f86e45c8944d72bde888e1..cad11d21a1cbf7892b7039deb30de587ac8ca816 100644 (file)
--- a/utils/wxPython/src/_extras.py
+++ b/utils/wxPython/src/_extras.py
@@ -153,10 +153,10 @@ def EVT_QUERY_NEW_PALETTE(win, func):
     win.Connect(-1, -1, wxEVT_QUERY_NEW_PALETTE, func)
 
 def EVT_WINDOW_CREATE(win, func):
     win.Connect(-1, -1, wxEVT_QUERY_NEW_PALETTE, func)
 
 def EVT_WINDOW_CREATE(win, func):

-    win.Connect(-1, -1, wxEVT_WINDOW_CREATE, func)
+    win.Connect(-1, -1, wxEVT_CREATE, func)

 
 def EVT_WINDOW_DESTROY(win, func):
 
 def EVT_WINDOW_DESTROY(win, func):

-    win.Connect(-1, -1, wxEVT_WINDOW_DESTROY, func)
+    win.Connect(-1, -1, wxEVT_DESTROY, func)

 
 
 
 
 
 


@@ -733,15 +733,18 @@ class wxPyOnDemandOutputWindow:
         self.frame  = None
         self.title  = title
 
         self.frame  = None
         self.title  = title
 

+

     def SetParent(self, parent):
         self.parent = parent
 
     def SetParent(self, parent):
         self.parent = parent
 

+

     def OnCloseWindow(self, event):
         if self.frame != None:
             self.frame.Destroy()
         self.frame = None
         self.text  = None
 
     def OnCloseWindow(self, event):
         if self.frame != None:
             self.frame.Destroy()
         self.frame = None
         self.text  = None
 

+

     # this provides the file-like behaviour
     def write(self, str):
         if not self.frame:
     # this provides the file-like behaviour
     def write(self, str):
         if not self.frame:


@@ -753,7 +756,10 @@ class wxPyOnDemandOutputWindow:
             EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.text.AppendText(str)
 
             EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.text.AppendText(str)
 

+

     def close(self):
     def close(self):

+        if self.frame != None:
+            self.frame.Destroy()

         self.frame = None
         self.text  = None
 
         self.frame = None
         self.text  = None
 


@@ -789,19 +795,22 @@ class wxApp(wxPyApp):
     def SetTopWindow(self, frame):
         if self.stdioWin:
             self.stdioWin.SetParent(frame)
     def SetTopWindow(self, frame):
         if self.stdioWin:
             self.stdioWin.SetParent(frame)

-            sys.stdout = self.stdioWin #sys.stderr =
+            sys.stderr = sys.stdout = self.stdioWin

         wxPyApp.SetTopWindow(self, frame)
 
         wxPyApp.SetTopWindow(self, frame)
 

+

     def MainLoop(self):
         wxPyApp.MainLoop(self)
         self.RestoreStdio()
 
     def MainLoop(self):
         wxPyApp.MainLoop(self)
         self.RestoreStdio()
 

+

     def RedirectStdio(self, filename):
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:
             self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow
 
     def RedirectStdio(self, filename):
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:
             self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow
 

+

     def RestoreStdio(self):
         sys.stdout, sys.stderr = self.saveStdio
         if self.stdioWin != None:
     def RestoreStdio(self):
         sys.stdout, sys.stderr = self.saveStdio
         if self.stdioWin != None: