Removed deprecation warnings in OGL and Gizmos

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

index 2e9664e70ac1dfeb33caeab6d1aaeb934e20c67b..159d06b32865f1e60d386f0a0d202f04b96c5e9a 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -7,7 +7,8 @@ import images
  
  class TestPanel(wxPanel):
      def __init__(self, parent, log):
  
  class TestPanel(wxPanel):
      def __init__(self, parent, log):
-        wxPanel.__init__(self, parent, -1)
+        wxPanel.__init__(self, parent, -1,
+                         style=wxNO_FULL_REPAINT_ON_RESIZE)
          self.log = log
  
          b = wxButton(self, 10, "Hello", wxPoint(20, 20))
          self.log = log
  
          b = wxButton(self, 10, "Hello", wxPoint(20, 20))
@@ -16,26 +17,40 @@ class TestPanel(wxPanel):
          b.SetForegroundColour(wxWHITE)
          b.SetDefault()
  
          b.SetForegroundColour(wxWHITE)
          b.SetDefault()
  
-        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
+        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(120, 45))
          EVT_BUTTON(self, 20, self.OnClick)
          EVT_BUTTON(self, 20, self.OnClick)
-
          b.SetToolTipString("This is a Hello button...")
  
          b.SetToolTipString("This is a Hello button...")
  
-        bmp = images.getTest2Bitmap()
-        mask = wxMaskColour(bmp, wxBLUE)
-        bmp.SetMask(mask)
+        if 0:  # a test case for catching wxPyAssertionError
+
+            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_SUPPRESS)
+            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_EXCEPTION)
+            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_DIALOG)
+            #wxGetApp().SetAssertMode(wxPYAPP_ASSERT_EXCEPTION | wxPYAPP_ASSERT_DIALOG)
  
  
-        wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
+            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 = images.getTest2Bitmap()
+                mask = wxMaskColour(bmp, wxBLUE)
+        else:
+            bmp = images.getTest2Bitmap()
+            mask = wxMaskColour(bmp, wxBLUE)
+
+        bmp.SetMask(mask)
+        wxBitmapButton(self, 30, bmp, wxPoint(160, 20),
                         wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
          EVT_BUTTON(self, 30, self.OnClick)
  
                         wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
          EVT_BUTTON(self, 30, self.OnClick)
  
-        if wxUSE_UNICODE:
-            label = unichr(21514) + unichr(26984) + unichr(8307) + unichr(29545)
-            wxButton(self, -1, label+" (I have no idea what that says...)", (20, 150))
  
      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
  
  #----------------------------------------------------------------------
  
  
  #----------------------------------------------------------------------
  
@@ -46,15 +61,19 @@ def runTest(frame, nb, log):
  #----------------------------------------------------------------------
  
  
  #----------------------------------------------------------------------
  
  
+overview = """<html><body>
+<h2>wxButton</h2>
  
  
+A button is a control that contains a text string or a bitmap and cab 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])])