X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e478ff9e2d0e7af89771856b4b57f5f280bd5343..2742805a620cf7ef8e80e80e96f5d2e447f64279:/wxPython/demo/run.py

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 39554173aa..d0734b6c97 100755
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -21,9 +21,9 @@ import wx                  # This module uses the new wx namespace
 import sys, os
 
 # stuff for debugging
-print "wx.VERSION_STRING = ", wx.VERSION_STRING
+print "wx.VERSION_STRING = %s (%s)" % (wx.VERSION_STRING, wx.USE_UNICODE and 'unicode' or 'ansi')
 print "pid:", os.getpid()
-##raw_input("Press a key...")
+##raw_input("Press Enter...")
 
 assertMode = wx.PYAPP_ASSERT_DIALOG
 ##assertMode = wx.PYAPP_ASSERT_EXCEPTION
@@ -44,11 +44,10 @@ 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)
@@ -59,8 +58,8 @@ class RunDemoApp(wx.App):
 
         menuBar = wx.MenuBar()
         menu = wx.Menu()
-        item = menu.Append(-1, "E&xit\tAlt-X", "Exit demo")
-        self.Bind(wx.EVT_MENU, self.OnButton, item)
+        item = menu.Append(-1, "E&xit\tCtrl-Q", "Exit demo")
+        self.Bind(wx.EVT_MENU, self.OnExitApp, item)
         menuBar.Append(menu, "&File")
 
         ns = {}
@@ -86,20 +85,10 @@ class RunDemoApp(wx.App):
             frect = frame.GetRect()
 
         else:
-            # otherwise the demo made its own frame, so just put a
-            # button in this one
-            if hasattr(frame, 'otherWin'):
-                ns['win'] = frame.otherWin
-                frect = frame.otherWin.GetRect()
-                p = wx.Panel(frame, -1)
-                b = wx.Button(p, -1, " Exit ", (10,10))
-                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
-                # gone, so we're done.
-                frame.Destroy()
-                return True
+            # It was probably a dialog or something that is already
+            # gone, so we're done.
+            frame.Destroy()
+            return True
 
         self.SetTopWindow(frame)
         self.frame = frame
@@ -126,7 +115,7 @@ class RunDemoApp(wx.App):
         return True
 
 
-    def OnButton(self, evt):
+    def OnExitApp(self, evt):
         self.frame.Close(True)