Fix addtofunc directives foir wxCheckListBox

[wxWidgets.git] / wxPython / demo / wxButton.py
diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/wxButton.py

index b9bdc0bbc7082198da8a95a1c7ceff6866319711..039ff89e4b3c799b4bff0cdb11aa3034fe2ce6cc 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -1,37 +1,58 @@
+# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
  
  
-from wxPython.wx import *
+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)
+        wx.Panel.__init__(self, parent, -1,
+                         style=wx.NO_FULL_REPAINT_ON_RESIZE)
          self.log = log
  
          self.log = log
  
-        b = wxButton(self, 10, "Hello", wxPoint(20, 20))
-        EVT_BUTTON(self, 10, self.OnClick)
-        b.SetBackgroundColour(wxBLUE)
-        b.SetForegroundColour(wxWHITE)
+        b = wx.Button(self, 10, "Default Button", (20, 20))
+        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
          b.SetDefault()
          b.SetDefault()
+        b.SetSize(b.GetBestSize())
+
+        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...")
+
+        if 0:  # a test case for catching wx.PyAssertionError
+
+            #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:
+                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()
+                mask = wx.MaskColour(bmp, wx.BLUE)
+        else:
+            bmp = images.getTest2Bitmap()
+            mask = wx.MaskColour(bmp, wx.BLUE)
  
  
-        wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
-        EVT_BUTTON(self, 20, self.OnClick)
-
-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
-
-        mask = wxMaskColour(bmp, wxBLUE)
          bmp.SetMask(mask)
          bmp.SetMask(mask)
-
-        print bmp.GetWidth(), bmp.GetHeight()
-
-        wxBitmapButton(self, 30, bmp, wxPoint(140, 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):
-        self.log.WriteText("Click! (%d)\n" % event.GetId())
+        self.log.write("Click! (%d)\n" % event.GetId())
+        ##wxLogDebug("debug message")
+
  
  
+## wxLog_SetLogLevel(wxLOG_Message)  # ignore everything above wxLOG_Message
  
  #----------------------------------------------------------------------
  
  
  #----------------------------------------------------------------------
  
@@ -42,15 +63,19 @@ def runTest(frame, nb, log):
  #----------------------------------------------------------------------
  
  
  #----------------------------------------------------------------------
  
  
+overview = """<html><body>
+<h2>Button</h2>
  
  
+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>
+"""
  
  
  
  
  
  
-
-
-
-overview = """\
-"""
-
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])