Script updates

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

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index 560cfb8001c486c373b4a552001691c055ebba35..0e238b55fc55744859aa2b362f690e9baf13df00 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -18,9 +18,16 @@ on the command line.
 """
 
 import wx                  # This module uses the new wx namespace
+import sys, os
+
+# stuff for debugging
 print "wx.VERSION_STRING = ", wx.VERSION_STRING
+print "pid:", os.getpid()
+##raw_input("Press a key...")
+
+assertMode = wx.PYAPP_ASSERT_DIALOG
+##assertMode = wx.PYAPP_ASSERT_EXCEPTION
 
-import sys, os
 
 #----------------------------------------------------------------------------
 
@@ -43,19 +50,21 @@ class RunDemoApp(wx.App):
         wx.InitAllImageHandlers()
         wx.Log_SetActiveTarget(wx.LogStderr())
 
-        #self.SetAssertMode(wx.PYAPP_ASSERT_DIALOG)
+        self.SetAssertMode(assertMode)
 
-        frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(0,0),
+        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)
         frame.CreateStatusBar()
+
         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\tAlt-X", "Exit demo")
+        self.Bind(wx.EVT_MENU, self.OnButton, item)
         menuBar.Append(menu, "&File")
+
         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())
 
@@ -71,9 +80,12 @@ class RunDemoApp(wx.App):
             # otherwise the demo made its own frame, so just put a
             # button in this one
             if hasattr(frame, 'otherWin'):
-                b = wx.Button(frame, -1, " Exit ")
-                frame.SetSize((200, 100))
-                wx.EVT_BUTTON(frame, b.GetId(), self.OnButton)
+                p = wx.Panel(frame, -1)
+                b = wx.Button(p, -1, " Exit ", (10,10))
+                p.Fit()
+                frame.SetClientSize(p.GetSize())
+                #frame.SetSize((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.
@@ -105,9 +117,7 @@ def main(argv):
         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)