Some updates (incomplete)

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

diff --git a/wxPython/demo/wxFrame.py b/wxPython/demo/wxFrame.py
index 9b96b2b7bae97676d47a68c086daf46765fa8812..6fbc2d013f796afe51b97a111308b38e88f0d823 100644 (file)
--- a/wxPython/demo/wxFrame.py
+++ b/wxPython/demo/wxFrame.py
@@ -4,8 +4,9 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class MyFrame(wxFrame):
 #---------------------------------------------------------------------------
 
 class MyFrame(wxFrame):

-    def __init__(self, parent, ID, title, pos, size):
-        wxFrame.__init__(self, parent, ID, title, pos, size)
+    def __init__(self, parent, ID, title, pos=wxDefaultPosition,
+                 size=wxDefaultSize, style=wxDEFAULT_FRAME_STYLE):
+        wxFrame.__init__(self, parent, ID, title, pos, size, style)

         panel = wxPanel(self, -1)
 
         button = wxButton(panel, 1003, "Close Me")
         panel = wxPanel(self, -1)
 
         button = wxButton(panel, 1003, "Close Me")


@@ -15,7 +16,7 @@ class MyFrame(wxFrame):
 
 
     def OnCloseMe(self, event):
 
 
     def OnCloseMe(self, event):

-        self.Close(true)
+        self.Close(True)

 
     def OnCloseWindow(self, event):
         self.Destroy()
 
     def OnCloseWindow(self, event):
         self.Destroy()


@@ -23,9 +24,10 @@ class MyFrame(wxFrame):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = MyFrame(frame, -1, "This is a wxFrame", wxDefaultPosition, wxSize(350, 200))
+    win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200),
+                  style = wxDEFAULT_FRAME_STYLE)# |  wxFRAME_TOOL_WINDOW )

     frame.otherWin = win
     frame.otherWin = win

-    win.Show(true)
+    win.Show(True)

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


@@ -41,3 +43,12 @@ def runTest(frame, nb, log):
 
 overview = """\
 """
 
 overview = """\
 """

+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+