newevent helpers

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

diff --git a/wxPython/demo/wxMiniFrame.py b/wxPython/demo/wxMiniFrame.py
index f3cd53a40a2d3f3a9eaa3bc02e62a3b45c639dba..b92e300eda39cf40e46f7114404578a3dc4c1292 100644 (file)
--- a/wxPython/demo/wxMiniFrame.py
+++ b/wxPython/demo/wxMiniFrame.py
@@ -3,29 +3,33 @@ from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 class MyMiniFrame(wxMiniFrame):
 
 #---------------------------------------------------------------------------
 class MyMiniFrame(wxMiniFrame):

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

         panel = wxPanel(self, -1)
 
         panel = wxPanel(self, -1)
 

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

         button.SetPosition(wxPoint(15, 15))
         button.SetPosition(wxPoint(15, 15))

-        EVT_BUTTON(self, 1003, self.OnCloseMe)
+        EVT_BUTTON(self, button.GetId(), self.OnCloseMe)

         EVT_CLOSE(self, self.OnCloseWindow)
 
     def OnCloseMe(self, event):
         EVT_CLOSE(self, self.OnCloseWindow)
 
     def OnCloseMe(self, event):

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

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

+        print "OnCloseWindow"

         self.Destroy()
 
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
         self.Destroy()
 
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = MyMiniFrame(frame, -1, "This is a wxMiniFrame",
-                      wxDefaultPosition, wxSize(200, 200),
-                      wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ)
+    win = MyMiniFrame(frame, "This is a wxMiniFrame",
+                      #pos=(250,250), size=(200,200),
+                      style=wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ)
+    win.SetSize((200, 200))
+    win.CenterOnParent(wxBOTH)

     frame.otherWin = win
     frame.otherWin = win

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

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


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

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