fixed compile error

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

diff --git a/wxPython/demo/GenericButtons.py b/wxPython/demo/GenericButtons.py
index 1e0ad0a1466b9a931e97e29ab83d9f3e5fa662f2..beb8a5245112e845d6b41e5dddd596e7f976e628 100644 (file)
--- a/wxPython/demo/GenericButtons.py
+++ b/wxPython/demo/GenericButtons.py
@@ -10,6 +10,7 @@ class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         wx.Panel.__init__(self, parent, -1)
         self.log = log
+        ##self.SetBackgroundColour("sky blue")
 
         sizer = wx.FlexGridSizer(1, 3, 20, 20)
 
@@ -43,6 +44,7 @@ class TestPanel(wx.Panel):
         b.SetFont(wx.Font(20, wx.SWISS, wx.NORMAL, wx.BOLD, False))
         b.SetBezelWidth(5)
         ###b.SetBestSize()
+        b.SetSizeHints(wx.DefaultSize)
         b.SetBackgroundColour("Navy")
         b.SetForegroundColour(wx.WHITE)
         b.SetToolTipString("This is a BIG button...")
@@ -67,11 +69,11 @@ class TestPanel(wx.Panel):
         b = buttons.GenBitmapButton(self, -1, None)
         self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         bmp = images.getBulb1Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapLabel(bmp)
         bmp = images.getBulb2Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetBestSize()
@@ -86,11 +88,11 @@ class TestPanel(wx.Panel):
         b = buttons.GenBitmapToggleButton(self, -1, None)
         self.Bind(wx.EVT_BUTTON, self.OnToggleButton, b)
         bmp = images.getBulb1Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapLabel(bmp)
         bmp = images.getBulb2Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetToggle(True)
@@ -101,11 +103,11 @@ class TestPanel(wx.Panel):
         b = buttons.GenBitmapTextButton(self, -1, None, "Bitmapped Text", size = (200, 45))
         self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         bmp = images.getBulb1Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapLabel(bmp)
         bmp = images.getBulb2Bitmap()
-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetUseFocusIndicator(False)