Use the stdout/stderr window by default on Mac too. Force it on in

the demo.

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 4cc8d92819671b7bd8da522ab6480b72be2128aa..e5b804fc3d9492607686ed1b6cc70e46ba308b68 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -15,6 +15,8 @@ import sys, os, time, string
 from   wxPython.wx import *
 from   wxPython.html import wxHtmlWindow
 
 from   wxPython.wx import *
 from   wxPython.html import wxHtmlWindow
 

+from wxPython.stc import *
+

 import images
 
 #---------------------------------------------------------------------------
 import images
 
 #---------------------------------------------------------------------------


@@ -628,7 +630,7 @@ def main():
         os.chdir(demoPath)
     except:
         pass
         os.chdir(demoPath)
     except:
         pass

-    app = MyApp(0)
+    app = MyApp(wxPlatform == "__WXMAC__")

     app.MainLoop()
 
 
     app.MainLoop()
 
 

diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index 68677a3da86edcbaf8ad12f66c39523bb4f9daf4..b3f9e52b3f45a1ac9f11b48113eae983aaf17ed3 100644 (file)
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -720,7 +720,7 @@ class wxPyOnDemandOutputWindow:
             self.frame.Close()
 
 
             self.frame.Close()
 
 

-_defRedirect = (wxPlatform == '__WXMSW__')
+_defRedirect = (wxPlatform == '__WXMSW__' or wxPlatform == '__WXMAC__')

 
 #----------------------------------------------------------------------
 # The main application class.  Derive from this and implement an OnInit
 
 #----------------------------------------------------------------------
 # The main application class.  Derive from this and implement an OnInit

diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 432dc65aee299150a7aa3a66a747390210d9c582..6614275ff974cb226795b3406557162b36ec40c7 100644 (file)
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,7 +12,6 @@
 
 %module wx
 
 
 %module wx
 

-

 %{
 #include "helpers.h"
 %}
 %{
 #include "helpers.h"
 %}