X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a39c03f9d298283c5ea91532c7544aeaf4c0f243..092d7f88f6819e52dd8ea69d66e474571e527eba:/wxPython/misc/widgetLayoutTest.py diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py index fc2b8922e4..21a61861ca 100644 --- 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._bestfit.SetValue( str(win.GetBestFittingSize()) ) + self._bestfit.SetValue( str(win.GetEffectiveMinSize()) ) 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) - 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("")