diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 4cc8d92819..e5b804fc3d 100644
--- 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.stc import *
+
 import images
 
 #---------------------------------------------------------------------------
@@ -628,7 +630,7 @@ def main():
         os.chdir(demoPath)
     except:
         pass
-    app = MyApp(0)
+    app = MyApp(wxPlatform == "__WXMAC__")
     app.MainLoop()
 
 
diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py
index 68677a3da8..b3f9e52b3f 100644
--- a/wxPython/src/_extras.py
+++ b/wxPython/src/_extras.py
@@ -720,7 +720,7 @@ class wxPyOnDemandOutputWindow:
             self.frame.Close()
 
 
-_defRedirect = (wxPlatform == '__WXMSW__')
+_defRedirect = (wxPlatform == '__WXMSW__' or wxPlatform == '__WXMAC__')
 
 #----------------------------------------------------------------------
 # The main application class.  Derive from this and implement an OnInit
diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i
index 432dc65aee..6614275ff9 100644
--- a/wxPython/src/wx.i
+++ b/wxPython/src/wx.i
@@ -12,7 +12,6 @@
 
 %module wx
 
-
 %{
 #include "helpers.h"
 %}