X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b7fa2d9691bc34339e38684a798e9ab3f711e13..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/demo/BitmapButton.py
diff --git a/wxPython/demo/BitmapButton.py b/wxPython/demo/BitmapButton.py
index c28562d38b..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):
@@ -49,9 +61,9 @@ def runTest(frame, nb, log):
overview = """
-StaticBitmap
+BitmapButton
-A StaticBitmap control displays a bitmap. It can have a separate bitmap for each button state: normal, selected, disabled.
+A BitmapButton control displays a bitmap. It can have a separate bitmap for each button state: normal, selected, disabled.
The bitmaps to be displayed should have a small number of colours, such as 16,
to avoid palette problems.