Don't use deprecated wx.MaskColour

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

diff --git a/wxPython/demo/GenericButtons.py b/wxPython/demo/GenericButtons.py
index 6ab17eb8372b4c28e3921233f9fb768ff4fad465..beb8a5245112e845d6b41e5dddd596e7f976e628 100644 (file)
--- a/wxPython/demo/GenericButtons.py
+++ b/wxPython/demo/GenericButtons.py
@@ -1,7 +1,3 @@
-# 11/6/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-#
 
 import  wx
 import  wx.lib.buttons  as  buttons
@@ -14,39 +10,41 @@ 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)
 
         # A regular button, selected as the default button
         b = wx.Button(self, -1, "A real button")
         b.SetDefault()
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         sizer.Add(b)
 
         # Same thing, but NOT set as the default button
         b = wx.Button(self, -1, "non-default")
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         sizer.Add(b)
         sizer.Add((10,10))
 
         # Plain old text button based off GenButton()
         b = buttons.GenButton(self, -1, 'Hello')
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         sizer.Add(b)
 
         # Plain old text button, disabled.
         b = buttons.GenButton(self, -1, 'disabled')
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         b.Enable(False)
         sizer.Add(b)
 
         # This time, we let the botton be as big as it can be.
         # Also, this one is fancier, with custom colors and bezel size.
         b = buttons.GenButton(self, -1, 'bigger')
-        self.Bind(wx.EVT_BUTTON, self.OnBiggerButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnBiggerButton, b)
         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...")
@@ -56,26 +54,26 @@ class TestPanel(wx.Panel):
         # An image button
         bmp = images.getTest2Bitmap()
         b = buttons.GenBitmapButton(self, -1, bmp)
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         sizer.Add(b)
 
         # An image button, disabled.
         bmp = images.getTest2Bitmap()
         b = buttons.GenBitmapButton(self, -1, bmp)
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
         sizer.Add(b)
         b.Enable(False)
 
         # An image button, using a mask to get rid of the
         # undesireable part of the image
         b = buttons.GenBitmapButton(self, -1, None)
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        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()
@@ -83,18 +81,18 @@ class TestPanel(wx.Panel):
 
         # A toggle button
         b = buttons.GenToggleButton(self, -1, "Toggle Button")
-        self.Bind(wx.EVT_BUTTON, self.OnToggleButton, id=b.GetId())
+        self.Bind(wx.EVT_BUTTON, self.OnToggleButton, b)
         sizer.Add(b)
 
         # An image toggle button
         b = buttons.GenBitmapToggleButton(self, -1, None)
-        self.Bind(wx.EVT_BUTTON, self.OnToggleButton, id=b.GetId())
+        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)
@@ -103,13 +101,13 @@ class TestPanel(wx.Panel):
 
         # A bitmap button with text.
         b = buttons.GenBitmapTextButton(self, -1, None, "Bitmapped Text", size = (200, 45))
-        self.Bind(wx.EVT_BUTTON, self.OnButton, id=b.GetId())
+        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)
@@ -155,5 +153,5 @@ overview = buttons.__doc__
 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:])