cleanup:

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

diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py
index 9cce150933fd77bd0872340fc2855805db7a7bb7..21a61861ca912564c94a934198d1d61239a0642c 100644 (file)
--- a/wxPython/misc/widgetLayoutTest.py
+++ b/wxPython/misc/widgetLayoutTest.py
@@ -446,7 +446,7 @@ class SizeInfoPane(wx.Panel):
         self._minsize.SetValue(    str(win.GetMinSize()) )
         self._bestsize.SetValue(   str(win.GetBestSize()) )
         self._adjbstsize.SetValue( str(win.GetAdjustedBestSize()) )
         self._minsize.SetValue(    str(win.GetMinSize()) )
         self._bestsize.SetValue(   str(win.GetBestSize()) )
         self._adjbstsize.SetValue( str(win.GetAdjustedBestSize()) )

-        self._bestfit.SetValue(    str(win.GetBestFittingSize()) )
+        self._bestfit.SetValue(    str(win.GetEffectiveMinSize()) )

 
     def Clear(self):
         self._size.SetValue("")
 
     def Clear(self):
         self._size.SetValue("")


@@ -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)
         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._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)
 
         # setup the layout
         fgs = wx.FlexGridSizer(2, 3, 5, 5)