initialize wxListItem::m_image to -1 (which means no image), not 0 (bug 1727909)

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

diff --git a/wxPython/demo/GenericButtons.py b/wxPython/demo/GenericButtons.py
index f99c65e3e67b5a643ba8fbbd75cfbedcd7d3e58f..a142d5c2342dc260b714d8a6dd608d4ebc0ecb53 100644 (file)
--- a/wxPython/demo/GenericButtons.py
+++ b/wxPython/demo/GenericButtons.py
@@ -43,7 +43,6 @@ class TestPanel(wx.Panel):
         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.SetMinSize(wx.DefaultSize)
         b.SetBackgroundColour("Navy")
         b.SetForegroundColour(wx.WHITE)
@@ -76,7 +75,7 @@ class TestPanel(wx.Panel):
         mask = wx.Mask(bmp, wx.BLUE)
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
-        b.SetBestSize()
+        b.SetInitialSize()
         sizer.Add(b)
 
         # A toggle button
@@ -96,7 +95,7 @@ class TestPanel(wx.Panel):
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetToggle(True)
-        b.SetBestSize()
+        b.SetInitialSize()
         sizer.Add(b)
 
         # A bitmap button with text.
@@ -111,7 +110,7 @@ class TestPanel(wx.Panel):
         bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetUseFocusIndicator(False)
-        b.SetBestSize()
+        b.SetInitialSize()
         sizer.Add(b)
 
 
@@ -129,6 +128,10 @@ class TestPanel(wx.Panel):
         ##b.SetBackgroundColour("sky blue")
         ##b.SetBackgroundColour("pink")
 
+        b = buttons.ThemedGenButton(self, -1, 'Drawn with native renderer')
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+        sizer.Add(b)
+        
 
         border = wx.BoxSizer(wx.VERTICAL)
         border.Add(sizer, 0, wx.ALL, 25)