X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..8c125d136d0e87702fe8964ff3eeb586b26ec821:/wxPython/demo/run.py

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index fb9b70a80f..f4bb659daa 100755
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -23,7 +23,7 @@ import sys, os
 # stuff for debugging
 print "wx.VERSION_STRING = ", wx.VERSION_STRING
 print "pid:", os.getpid()
-##raw_input("Press a key...")
+##raw_input("Press Enter...")
 
 assertMode = wx.PYAPP_ASSERT_DIALOG
 ##assertMode = wx.PYAPP_ASSERT_EXCEPTION
@@ -44,17 +44,16 @@ class RunDemoApp(wx.App):
         self.name = name
         self.demoModule = module
         self.useShell = useShell
-        wx.App.__init__(self, 0)
+        wx.App.__init__(self, redirect=False)
 
 
     def OnInit(self):
-        wx.InitAllImageHandlers()
         wx.Log_SetActiveTarget(wx.LogStderr())
 
         self.SetAssertMode(assertMode)
 
         frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100),
-                        style=wx.NO_FULL_REPAINT_ON_RESIZE|wx.DEFAULT_FRAME_STYLE)
+                        style=wx.DEFAULT_FRAME_STYLE)
         frame.CreateStatusBar()
 
         menuBar = wx.MenuBar()
@@ -64,6 +63,7 @@ class RunDemoApp(wx.App):
         menuBar.Append(menu, "&File")
 
         ns = {}
+        ns['wx'] = wx
         ns['app'] = self
         ns['module'] = self.demoModule
         ns['frame'] = frame
@@ -92,9 +92,7 @@ class RunDemoApp(wx.App):
                 frect = frame.otherWin.GetRect()
                 p = wx.Panel(frame, -1)
                 b = wx.Button(p, -1, " Exit ", (10,10))
-                p.Fit()
-                frame.SetClientSize(p.GetSize())
-                #frame.SetSize((200, 100))
+                wx.CallAfter(frame.SetClientSize, (200, 100))
                 frame.Bind(wx.EVT_BUTTON, self.OnButton, b)
             else:
                 # It was probably a dialog or something that is already
@@ -119,7 +117,8 @@ class RunDemoApp(wx.App):
             # Hook the close event of the test window so that we close
             # the shell at the same time
             def CloseShell(evt):
-                shell.Close()
+                if shell:
+                    shell.Close()
                 evt.Skip()
             frame.Bind(wx.EVT_CLOSE, CloseShell)