X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c8ad70ad4de074ff95b5e3629ebc272551921c0..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/demo/BitmapButton.py

diff --git a/wxPython/demo/BitmapButton.py b/wxPython/demo/BitmapButton.py
index 02d2c618ee..208b947e5d 100644
--- a/wxPython/demo/BitmapButton.py
+++ b/wxPython/demo/BitmapButton.py
@@ -2,6 +2,9 @@
 import  wx
 import  images
 
+#import wx.lib.buttons
+#wx.BitmapButton = wx.lib.buttons.GenBitmapButton
+
 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
@@ -19,20 +22,29 @@ class TestPanel(wx.Panel):
 
             try:
                 bmp = wx.Bitmap("nosuchfile.bmp", wx.BITMAP_TYPE_BMP)
-                mask = wx.MaskColour(bmp, wx.BLUE)
+                mask = wx.Mask(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)
+            mask = wx.Mask(bmp, wx.BLUE)
 
         bmp.SetMask(mask)
-        b = wx.BitmapButton(self, 30, bmp, (20, 20),
+        b = wx.BitmapButton(self, -1, bmp, (20, 20),
                        (bmp.GetWidth()+10, bmp.GetHeight()+10))
         b.SetToolTipString("This is a bitmap button.")
         self.Bind(wx.EVT_BUTTON, self.OnClick, b)
+
+        b = wx.BitmapButton(self, -1, bmp, (20, 120),
+                            style = wx.NO_BORDER)
+        
+        # hide a little surprise in the button...
+        b.SetBitmapSelected(images.getRobinBitmap())
+
+        b.SetToolTipString("This is a bitmap button with \nwx.NO_BORDER style.")
+        self.Bind(wx.EVT_BUTTON, self.OnClick, b)
         
 
     def OnClick(self, event):