]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/wxButton.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix addtofunc directives foir wxCheckListBox
[wxWidgets.git] / wxPython / demo / wxButton.py
diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/wxButton.py
index eaaefd2e6d0afbb12b153e9024153ee463beb21a..039ff89e4b3c799b4bff0cdb11aa3034fe2ce6cc 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -1,47 +1,50 @@
+# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
 
 
-from wxPython.wx import *
-
-import images
+import  wx
+import  images
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent, log):
     def __init__(self, parent, log):
-        wxPanel.__init__(self, parent, -1,
-                         style=wxNO_FULL_REPAINT_ON_RESIZE)
+        wx.Panel.__init__(self, parent, -1,
+                         style=wx.NO_FULL_REPAINT_ON_RESIZE)
         self.log = log
 
         self.log = log
 
-        b = wxButton(self, 10, "Default Button", wxPoint(20, 20))
-        EVT_BUTTON(self, 10, self.OnClick)
+        b = wx.Button(self, 10, "Default Button", (20, 20))
+        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
         b.SetDefault()
         b.SetSize(b.GetBestSize())
 
         b.SetDefault()
         b.SetSize(b.GetBestSize())
 
-        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 80), wxSize(120, 45))
-        EVT_BUTTON(self, 20, self.OnClick)
+        b = wx.Button(self, 20, "HELLO AGAIN!", (20, 80), (120, 45))
+        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
         b.SetToolTipString("This is a Hello button...")
 
         b.SetToolTipString("This is a Hello button...")
 
-        if 0:  # a test case for catching wxPyAssertionError
+        if 0:  # a test case for catching wx.PyAssertionError
 
 
-            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_SUPPRESS)
-            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_EXCEPTION)
-            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_DIALOG)
-            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_EXCEPTION | wxPYAPP_ASSERT_DIALOG)
+            #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
+            #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION)
+            #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_DIALOG)
+            #wx.GetApp().SetAssertMode(wx.PYAPP_ASSERT_EXCEPTION | wx.PYAPP_ASSERT_DIALOG)
 
             try:
 
             try:
-                bmp = wxBitmap("nosuchfile.bmp", wxBITMAP_TYPE_BMP)
-                mask = wxMaskColour(bmp, wxBLUE)
-            except wxPyAssertionError:
-                self.log.write("Caught wxPyAssertionError!  I will fix the problem.\n")
+                bmp = wx.Bitmap("nosuchfile.bmp", wx.BITMAP_TYPE_BMP)
+                mask = wx.MaskColour(bmp, wx.BLUE)
+            except wx.PyAssertionError:
+                self.log.write("Caught wx.PyAssertionError!  I will fix the problem.\n")
                 bmp = images.getTest2Bitmap()
                 bmp = images.getTest2Bitmap()
-                mask = wxMaskColour(bmp, wxBLUE)
+                mask = wx.MaskColour(bmp, wx.BLUE)
         else:
             bmp = images.getTest2Bitmap()
         else:
             bmp = images.getTest2Bitmap()
-            mask = wxMaskColour(bmp, wxBLUE)
+            mask = wx.MaskColour(bmp, wx.BLUE)
 
         bmp.SetMask(mask)
 
         bmp.SetMask(mask)
-        wxBitmapButton(self, 30, bmp, wxPoint(160, 20),
-                       wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
-        EVT_BUTTON(self, 30, self.OnClick)
+        wx.BitmapButton(self, 30, bmp, (160, 20),
+                       (bmp.GetWidth()+10, bmp.GetHeight()+10))
+        self.Bind(wx.EVT_BUTTON, self.OnClick, id=30)
 
 
     def OnClick(self, event):
 
 
     def OnClick(self, event):
@@ -61,9 +64,9 @@ def runTest(frame, nb, log):
 
 
 overview = """<html><body>
 
 
 overview = """<html><body>
-<h2>wxButton</h2>
+<h2>Button</h2>
 
 
-A button is a control that contains a text string or a bitmap and cab be
+A button is a control that contains a text string or a bitmap and can be
 placed on nearly any kind of window.
 
 </body></html>
 placed on nearly any kind of window.
 
 </body></html>
wxWidgets (Impactor)