Another package name fix

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

diff --git a/wxPython/demo/BitmapButton.py b/wxPython/demo/BitmapButton.py
index 02d2c618eecee29e94fad9ea0d881721db2e9427..208b947e5dd7e4076065f58f86e092b3bba65eb9 100644 (file)
--- a/wxPython/demo/BitmapButton.py
+++ b/wxPython/demo/BitmapButton.py
@@ -2,6 +2,9 @@
 import  wx
 import  images
 
 import  wx
 import  images
 

+#import wx.lib.buttons
+#wx.BitmapButton = wx.lib.buttons.GenBitmapButton
+

 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):


@@ -19,20 +22,29 @@ class TestPanel(wx.Panel):
 
             try:
                 bmp = wx.Bitmap("nosuchfile.bmp", wx.BITMAP_TYPE_BMP)
 
             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()
             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)
 
         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)
                        (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):
         
 
     def OnClick(self, event):