Warning fixes and source cleaning.

[wxWidgets.git] / wxPython / demo / run.py

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 82d702bb4325c443fc75d13012b3ab0881dd42c7..3c27661e9ed49357c2b1dbdfd2f1278d4e367e30 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -17,37 +17,61 @@ directory within its own frame window.  Just specify the module name
 on the command line.
 """
 
-
+import wx                  # This module uses the new wx namespace
 import sys, os
-from wxPython.wx import *
+
+# stuff for debugging
+print "wx.version:", wx.version()
+print "pid:", os.getpid()
+##raw_input("Press Enter...")
+
+assertMode = wx.PYAPP_ASSERT_DIALOG
+##assertMode = wx.PYAPP_ASSERT_EXCEPTION
+
 
 #----------------------------------------------------------------------------
 
 class Log:
     def WriteText(self, text):
-        sys.stdout.write(text)
+        if text[-1:] == '\n':
+            text = text[:-1]
+        wx.LogMessage(text)
     write = WriteText
 
 
-class RunDemoApp(wxApp):
-    def __init__(self, name, module):
+class RunDemoApp(wx.App):
+    def __init__(self, name, module, useShell):
         self.name = name
         self.demoModule = module
-        wxApp.__init__(self, 0) ##wxPlatform == "__WXMAC__")
+        self.useShell = useShell
+        wx.App.__init__(self, redirect=False)
 
 
     def OnInit(self):
-        wxInitAllImageHandlers()
-        frame = wxFrame(None, -1, "RunDemo: " + self.name, size=(0,0),
-                        style=wxNO_FULL_REPAINT_ON_RESIZE|wxDEFAULT_FRAME_STYLE)
+        wx.Log_SetActiveTarget(wx.LogStderr())
+
+        self.SetAssertMode(assertMode)
+
+        frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100),
+                        style=wx.DEFAULT_FRAME_STYLE)
         frame.CreateStatusBar()
-        menuBar = wxMenuBar()
-        menu = wxMenu()
-        menu.Append(101, "E&xit\tAlt-X", "Exit demo")
-        EVT_MENU(self, 101, self.OnButton)
+
+        menuBar = wx.MenuBar()
+        menu = wx.Menu()
+        item = menu.Append(-1, "E&xit\tCtrl-Q", "Exit demo")
+        self.Bind(wx.EVT_MENU, self.OnExitApp, item)
         menuBar.Append(menu, "&File")
+
+        ns = {}
+        ns['wx'] = wx
+        ns['app'] = self
+        ns['module'] = self.demoModule
+        ns['frame'] = frame
+        
         frame.SetMenuBar(menuBar)
-        frame.Show(true)
+        frame.Show(True)
+        frame.Bind(wx.EVT_CLOSE, self.OnCloseFrame)
+
         win = self.demoModule.runTest(frame, frame, Log())
 
         # a window will be returned if the demo does not create
@@ -56,45 +80,71 @@ class RunDemoApp(wxApp):
             # so set the frame to a good size for showing stuff
             frame.SetSize((640, 480))
             win.SetFocus()
+            self.window = win
+            ns['win'] = win
+            frect = frame.GetRect()
 
         else:
-            # otherwise the demo made its own frame, so just put a
-            # button in this one
-            if hasattr(frame, 'otherWin'):
-                b = wxButton(frame, -1, " Exit ")
-                frame.SetSize((200, 100))
-                EVT_BUTTON(frame, b.GetId(), self.OnButton)
-            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
-        #wxLog_SetActiveTarget(wxLogStderr())
-        #wxLog_SetTraceMask(wxTraceMessages)
-        return true
+        #wx.Log_SetActiveTarget(wx.LogStderr())
+        #wx.Log_SetTraceMask(wx.TraceMessages)
+
+        if self.useShell:
+            # Make a PyShell window, and position it below our test window
+            from wx import py
+            shell = py.shell.ShellFrame(None, locals=ns)
+            frect.OffsetXY(0, frect.height)
+            frect.height = 400
+            shell.SetRect(frect)
+            shell.Show()
+
+            # Hook the close event of the test window so that we close
+            # the shell at the same time
+            def CloseShell(evt):
+                if shell:
+                    shell.Close()
+                evt.Skip()
+            frame.Bind(wx.EVT_CLOSE, CloseShell)
+                    
+        return True
+
+
+    def OnExitApp(self, evt):
+        self.frame.Close(True)
+
 
+    def OnCloseFrame(self, evt):
+        if hasattr(self, "window") and hasattr(self.window, "ShutdownDemo"):
+            self.window.ShutdownDemo()
+        evt.Skip()
 
-    def OnButton(self, evt):
-        self.frame.Close(true)
 
 #----------------------------------------------------------------------------
 
 
 def main(argv):
+    useShell = False
+    for x in range(len(sys.argv)):
+        if sys.argv[x] in ['--shell', '-shell', '-s']:
+            useShell = True
+            del sys.argv[x]
+            break
+            
     if len(argv) < 2:
         print "Please specify a demo module name on the command-line"
         raise SystemExit
 
-    name = argv[1]
-    if name[-3:] == '.py':
-        name = name[:-3]
+    name, ext  = os.path.splitext(argv[1])
     module = __import__(name)
 
 
-    app = RunDemoApp(name, module)
+    app = RunDemoApp(name, module, useShell)
     app.MainLoop()