X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5bff6bb8eace63d3841c1eb6d36230647c854f76..c5145d41777d5c47a0d82120d1d99a6cb66e91c7:/utils/wxPython/demo/GenericButtons.py

diff --git a/utils/wxPython/demo/GenericButtons.py b/utils/wxPython/demo/GenericButtons.py
index dd74c531fb..876542eae8 100644
--- a/utils/wxPython/demo/GenericButtons.py
+++ b/utils/wxPython/demo/GenericButtons.py
@@ -14,17 +14,17 @@ class TestPanel(wxPanel):
         b = wxButton(self, -1, "A real button", (10,10))
         b.SetDefault()
         EVT_BUTTON(self, b.GetId(), self.OnButton)
-        b = wxButton(self, -1, "non-default", (100, 10))
+        b = wxButton(self, -1, "non-default", (140, 10))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         #wxTextCtrl(self, -1, "", (10,40))
 
         b = wxGenButton(self, -1, 'Hello', (10,65))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
-        b = wxGenButton(self, -1, 'disabled', (100,65))
+        b = wxGenButton(self, -1, 'disabled', (140,65))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         b.Enable(false)
 
-        b = wxGenButton(self, -1, 'bigger', (195,50))
+        b = wxGenButton(self, -1, 'bigger', (250,50))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         b.SetFont(wxFont(20, wxSWISS, wxNORMAL, wxBOLD, false))
         b.SetBezelWidth(5)
@@ -38,17 +38,15 @@ class TestPanel(wxPanel):
         EVT_BUTTON(self, b.GetId(), self.OnButton)
 
 
-        b = wxGenBitmapButton(self, -1, None, (100, 130))
+        b = wxGenBitmapButton(self, -1, None, (140, 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)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetBestSize()
 
@@ -56,17 +54,15 @@ class TestPanel(wxPanel):
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
 
 
-        b = wxGenBitmapToggleButton(self, -1, None, (100, 230))
+        b = wxGenBitmapToggleButton(self, -1, None, (140, 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)
-        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()