Themes and threads testing code.

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

diff --git a/utils/wxPython/demo/GenericButtons.py b/utils/wxPython/demo/GenericButtons.py
index dd74c531fbfa52b1bdca1d075b92b3efe53d45ea..b67a00acde8f44b78592b8b5c25985b0aad063c4 100644 (file)
--- a/utils/wxPython/demo/GenericButtons.py
+++ b/utils/wxPython/demo/GenericButtons.py
@@ -41,14 +41,12 @@ class TestPanel(wxPanel):
         b = wxGenBitmapButton(self, -1, None, (100, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
         b = wxGenBitmapButton(self, -1, None, (100, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)

-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)

         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)

-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)

         b.SetBitmapSelected(bmp)
         b.SetBestSize()
 
         b.SetBitmapSelected(bmp)
         b.SetBestSize()
 


@@ -59,14 +57,12 @@ class TestPanel(wxPanel):
         b = wxGenBitmapToggleButton(self, -1, None, (100, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
         b = wxGenBitmapToggleButton(self, -1, None, (100, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)

-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)

         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)

-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)

         b.SetBitmapSelected(bmp)
         b.SetToggle(true)
         b.SetBestSize()
         b.SetBitmapSelected(bmp)
         b.SetToggle(true)
         b.SetBestSize()