Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as

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

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index fda545c5b093156eb7de34c29ad06ac21376a001..b7b1a38ec0ffcc10962f2c9d7f24fd14225b92d5 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -17,13 +17,14 @@ directory within its own frame window.  Just specify the module name
 on the command line.
 """
 
 on the command line.
 """
 

-import wx                  # This module uses the new wx namespace
+import wx
+import wx.lib.mixins.inspection

 import sys, os
 
 # stuff for debugging
 import sys, os
 
 # stuff for debugging

-print "wx.VERSION_STRING = ", wx.VERSION_STRING
+print "wx.version:", wx.version()

 print "pid:", os.getpid()
 print "pid:", os.getpid()

-##raw_input("Press a key...")
+##raw_input("Press Enter...")

 
 assertMode = wx.PYAPP_ASSERT_DIALOG
 ##assertMode = wx.PYAPP_ASSERT_EXCEPTION
 
 assertMode = wx.PYAPP_ASSERT_DIALOG
 ##assertMode = wx.PYAPP_ASSERT_EXCEPTION


@@ -39,30 +40,39 @@ class Log:
     write = WriteText
 
 
     write = WriteText
 
 

-class RunDemoApp(wx.App):
-    def __init__(self, name, module):
+class RunDemoApp(wx.App, wx.lib.mixins.inspection.InspectionMixin):
+    def __init__(self, name, module, useShell):

         self.name = name
         self.demoModule = module
         self.name = name
         self.demoModule = module

-        wx.App.__init__(self, 0)
+        self.useShell = useShell
+        wx.App.__init__(self, redirect=False)

 
 
     def OnInit(self):
 
 
     def OnInit(self):

-        wx.InitAllImageHandlers()

         wx.Log_SetActiveTarget(wx.LogStderr())
 
         self.SetAssertMode(assertMode)
         wx.Log_SetActiveTarget(wx.LogStderr())
 
         self.SetAssertMode(assertMode)

+        self.Init()  # InspectionMixin

 
         frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100),
 
         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, name="run a sample")

         frame.CreateStatusBar()
         frame.CreateStatusBar()

+

         menuBar = wx.MenuBar()
         menu = wx.Menu()
         menuBar = wx.MenuBar()
         menu = wx.Menu()

-        menu.Append(101, "E&xit\tAlt-X", "Exit demo")
-        wx.EVT_MENU(self, 101, self.OnButton)
+        item = menu.Append(-1, "E&xit\tCtrl-Q", "Exit demo")
+        self.Bind(wx.EVT_MENU, self.OnExitApp, item)

         menuBar.Append(menu, "&File")
         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.SetMenuBar(menuBar)
         frame.Show(True)

-        wx.EVT_CLOSE(frame, self.OnCloseFrame)
+        frame.Bind(wx.EVT_CLOSE, self.OnCloseFrame)

 
         win = self.demoModule.runTest(frame, frame, Log())
 
 
         win = self.demoModule.runTest(frame, frame, Log())
 


@@ -73,31 +83,41 @@ class RunDemoApp(wx.App):
             frame.SetSize((640, 480))
             win.SetFocus()
             self.window = win
             frame.SetSize((640, 480))
             win.SetFocus()
             self.window = win

+            ns['win'] = win
+            frect = frame.GetRect()

 
         else:
 
         else:

-            # otherwise the demo made its own frame, so just put a
-            # button in this one
-            if hasattr(frame, 'otherWin'):
-                p = wx.Panel(frame, -1)
-                b = wx.Button(p, -1, " Exit ", (10,10))
-                p.Fit()
-                frame.SetClientSize(p.GetSize())
-                #frame.SetSize((200, 100))
-                wx.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
         #wx.Log_SetActiveTarget(wx.LogStderr())
         #wx.Log_SetTraceMask(wx.TraceMessages)
 
         self.SetTopWindow(frame)
         self.frame = frame
         #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
 
 
         return True
 
 

-    def OnButton(self, evt):
+    def OnExitApp(self, evt):

         self.frame.Close(True)
 
 
         self.frame.Close(True)
 
 


@@ -111,6 +131,13 @@ class RunDemoApp(wx.App):
 
 
 def main(argv):
 
 
 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
     if len(argv) < 2:
         print "Please specify a demo module name on the command-line"
         raise SystemExit


@@ -119,7 +146,7 @@ def main(argv):
     module = __import__(name)
 
 
     module = __import__(name)
 
 

-    app = RunDemoApp(name, module)
+    app = RunDemoApp(name, module, useShell)

     app.MainLoop()
 
 
     app.MainLoop()