merge from 2.8 branch

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

diff --git a/wxPython/demo/Button.py b/wxPython/demo/Button.py
index 039ff89e4b3c799b4bff0cdb11aa3034fe2ce6cc..46415e45af79ebf387bca4f3d523140806cdc3f5 100644 (file)
--- a/wxPython/demo/Button.py
+++ b/wxPython/demo/Button.py
@@ -1,10 +1,5 @@
-# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  wx
 
 import  wx

-import  images

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


@@ -19,40 +14,17 @@ class TestPanel(wx.Panel):
         b.SetDefault()
         b.SetSize(b.GetBestSize())
 
         b.SetDefault()
         b.SetSize(b.GetBestSize())
 

-        b = wx.Button(self, 20, "HELLO AGAIN!", (20, 80), (120, 45))
+        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...")
 
         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)
-
-        bmp.SetMask(mask)
-        wx.BitmapButton(self, 30, bmp, (160, 20),
-                       (bmp.GetWidth()+10, bmp.GetHeight()+10))
-        self.Bind(wx.EVT_BUTTON, self.OnClick, id=30)
+        b = wx.Button(self, 40, "Flat Button?", (20,150), style=wx.NO_BORDER)
+        b.SetToolTipString("This button has a style flag of wx.NO_BORDER.\nOn some platforms that will give it a flattened look.")
+        self.Bind(wx.EVT_BUTTON, self.OnClick, b)

 
 
     def OnClick(self, event):
         self.log.write("Click! (%d)\n" % event.GetId())
 
 
     def OnClick(self, event):
         self.log.write("Click! (%d)\n" % event.GetId())

-        ##wxLogDebug("debug message")
-
-
-## wxLog_SetLogLevel(wxLOG_Message)  # ignore everything above wxLOG_Message

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


@@ -77,5 +49,5 @@ placed on nearly any kind of window.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])