X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6999b0d8e9740918ed66bff0ee6fe147b6367a97..a37a5a73c54c0e120f0a35fc02e3ac4b600a42ff:/utils/wxPython/demo/GenericButtons.py?ds=sidebyside

diff --git a/utils/wxPython/demo/GenericButtons.py b/utils/wxPython/demo/GenericButtons.py
index e069d7ec52..876542eae8 100644
--- a/utils/wxPython/demo/GenericButtons.py
+++ b/utils/wxPython/demo/GenericButtons.py
@@ -14,31 +14,31 @@ 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), (120, 55))
+        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)
-        b.SetBackgroundColour(wxBLUE)
+        b.SetBestSize()
+        b.SetBackgroundColour(wxNamedColour("Navy"))
         b.SetForegroundColour(wxWHITE)
         #b.SetUseFocusIndicator(false)
 
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
-        b = wxGenBitmapButton(self, -1, bmp, (10, 130),
-                              (bmp.GetWidth()+16, bmp.GetHeight()+16))
+        b = wxGenBitmapButton(self, -1, bmp, (10, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
 
 
-        b = wxGenBitmapButton(self, -1, None, (100, 130), (48,48))
+        b = wxGenBitmapButton(self, -1, None, (140, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
         mask = wxMaskColour(bmp, wxBLUE)
@@ -48,13 +48,13 @@ class TestPanel(wxPanel):
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
+        b.SetBestSize()
 
-
-        b = wxGenToggleButton(self, -1, "Toggle Button", (10, 230), (85, 26))
+        b = wxGenToggleButton(self, -1, "Toggle Button", (10, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
 
 
-        b = wxGenBitmapToggleButton(self, -1, None, (100, 230), (48,48))
+        b = wxGenBitmapToggleButton(self, -1, None, (140, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
         mask = wxMaskColour(bmp, wxBLUE)
@@ -64,6 +64,8 @@ class TestPanel(wxPanel):
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
+        b.SetToggle(true)
+        b.SetBestSize()
 
 
     def OnButton(self, event):