'[1219035] cleanup: miscellaneous' and minor source cleaning.

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

diff --git a/wxPython/demo/Frame.py b/wxPython/demo/Frame.py
index b2028e6eb57b7bed1e3acdc56e7d1911b0698ad5..6a20509499d2f398813f912c08b2a4dcdcbdde98 100644 (file)
--- a/wxPython/demo/Frame.py
+++ b/wxPython/demo/Frame.py
@@ -1,7 +1,3 @@
-# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  wx
 
 
 import  wx
 


@@ -30,11 +26,28 @@ class MyFrame(wx.Frame):
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Create and Show a Frame", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        win = MyFrame(self, -1, "This is a wx.Frame", size=(350, 200),
+                  style = wx.DEFAULT_FRAME_STYLE)
+        win.Show(True)
+
+        
+
+#---------------------------------------------------------------------------
+
+

 def runTest(frame, nb, log):
 def runTest(frame, nb, log):

-    win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200),
-                  style = wx.DEFAULT_FRAME_STYLE)# |  wx.FRAME_TOOL_WINDOW )
-    frame.otherWin = win
-    win.Show(True)
+    win = TestPanel(nb, log)
+    return win

 
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------


@@ -67,5 +80,5 @@ the Frame itself.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])