update version number, add build_options patch

[wxWidgets.git] / wxPython / misc / widgetLayoutTest.py

diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py
index 3bc942752aaffad209ca90452cf91d341800107b..bcb463e87c1e42bf319024aea88a2601ea10ac17 100644 (file)
--- a/wxPython/misc/widgetLayoutTest.py
+++ b/wxPython/misc/widgetLayoutTest.py
@@ -50,10 +50,10 @@ class LayoutTestFrame(wx.Frame):
 
         bottomPanel = wx.Panel(p, style=wx.SUNKEN_BORDER, name="bottomPanel")
         bottomPanel.SetMinSize((640,240))
-        bottomPanel.SetDefaultBackgroundColour("light blue")
+        bottomPanel.SetOwnBackgroundColour("light blue")
 
         self.testPanel = wx.Panel(bottomPanel, name="testPanel")
-        self.testPanel.SetDefaultBackgroundColour((205, 183, 181)) # mistyrose3
+        self.testPanel.SetOwnBackgroundColour((205, 183, 181)) # mistyrose3
         self.testWidget = None
 
         self.infoPane = InfoPane(p)
@@ -468,10 +468,10 @@ class ColourInfoPanel(wx.Panel):
         sb = wx.StaticBox(self, -1, label)
         self._fgtxt = wx.TextCtrl(self, -1, "", style=wx.TE_READONLY)
         self._fgclr = wx.Panel(self, style=wx.SIMPLE_BORDER)
-        self._fgclr.SetSizeHints((20,20))
+        self._fgclr.SetMinSize((20,20))
         self._bgtxt = wx.TextCtrl(self, -1, "", style=wx.TE_READONLY)
         self._bgclr = wx.Panel(self, style=wx.SIMPLE_BORDER)
-        self._bgclr.SetSizeHints((20,20))
+        self._bgclr.SetMinSize((20,20))
 
         # setup the layout
         fgs = wx.FlexGridSizer(2, 3, 5, 5)
@@ -502,9 +502,6 @@ class ColourInfoPanel(wx.Panel):
         self._fgtxt.SetValue( clr2hex(win.GetForegroundColour(), self._fgclr) )
         self._bgtxt.SetValue( clr2hex(win.GetBackgroundColour(), self._bgclr) )
 
-##         f = win.GetFont()
-##         print f.GetNativeFontInfo().ToString()
-        
 
     def Clear(self):
         self._fgtxt.SetValue("")