From 5193b348e83ce2d8117e96ee269a099e2528f544 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 4 Aug 2004 22:24:57 +0000 Subject: [PATCH] SetSizeHints --> SetMinSize or SetBestFittingSize, and other tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/GenericButtons.py | 2 +- wxPython/demo/KeyEvents.py | 2 +- wxPython/wx/lib/buttons.py | 4 ++-- wxPython/wx/lib/masked/combobox.py | 6 ++---- wxPython/wx/lib/masked/maskededit.py | 8 +++----- wxPython/wx/lib/masked/textctrl.py | 3 +-- wxPython/wx/lib/scrolledpanel.py | 2 +- wxPython/wx/lib/statbmp.py | 4 ++-- wxPython/wx/lib/stattext.py | 6 +++--- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/wxPython/demo/GenericButtons.py b/wxPython/demo/GenericButtons.py index beb8a52451..7bbe9d5704 100644 --- a/wxPython/demo/GenericButtons.py +++ b/wxPython/demo/GenericButtons.py @@ -44,7 +44,7 @@ class TestPanel(wx.Panel): b.SetFont(wx.Font(20, wx.SWISS, wx.NORMAL, wx.BOLD, False)) b.SetBezelWidth(5) ###b.SetBestSize() - b.SetSizeHints(wx.DefaultSize) + b.SetMinSize(wx.DefaultSize) b.SetBackgroundColour("Navy") b.SetForegroundColour(wx.WHITE) b.SetToolTipString("This is a BIG button...") diff --git a/wxPython/demo/KeyEvents.py b/wxPython/demo/KeyEvents.py index b1e8700226..611c51f76e 100644 --- a/wxPython/demo/KeyEvents.py +++ b/wxPython/demo/KeyEvents.py @@ -265,7 +265,7 @@ class TestPanel(wx.Panel): self.log = log wx.Panel.__init__(self, parent, -1, style=0) self.keysink = KeySink(self) - self.keysink.SetSizeHints((100, 65)) + self.keysink.SetMinSize((100, 65)) self.keylog = KeyLog(self) btn = wx.Button(self, -1, "Clear Log") diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py index 68260c0572..833f176a57 100644 --- a/wxPython/wx/lib/buttons.py +++ b/wxPython/wx/lib/buttons.py @@ -77,7 +77,7 @@ class GenButton(wx.PyControl): self.SetLabel(label) self.InheritAttributes() - self.SetBestSize(size) + self.SetBestFittingSize(size) self.InitColours() self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown) @@ -100,7 +100,7 @@ class GenButton(wx.PyControl): """ if size is None: size = wx.DefaultSize - wx.PyControl.SetBestSize(self, size) + wx.PyControl.SetBestFittingSize(self, size) def DoGetBestSize(self): diff --git a/wxPython/wx/lib/masked/combobox.py b/wxPython/wx/lib/masked/combobox.py index 7e1ec0d0d5..d41d85e66c 100644 --- a/wxPython/wx/lib/masked/combobox.py +++ b/wxPython/wx/lib/masked/combobox.py @@ -122,8 +122,7 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ): self.SetClientSize(self._CalcSize()) width = self.GetSize().width height = self.GetBestSize().height - self.SetSize((width, height)) - self.SetSizeHints((width, height)) + self.SetBestFittingSize((width, height)) if value: @@ -179,8 +178,7 @@ class BaseMaskedComboBox( wx.ComboBox, MaskedEditMixin ): width = self.GetSize().width height = self.GetBestSize().height dbg('setting client size to:', (width, height)) - self.SetSize((width, height)) - self.SetSizeHints((width, height)) + self.SetBestFittingSize((width, height)) def _GetSelection(self): diff --git a/wxPython/wx/lib/masked/maskededit.py b/wxPython/wx/lib/masked/maskededit.py index dc78b9dc7e..a3801d6eb9 100644 --- a/wxPython/wx/lib/masked/maskededit.py +++ b/wxPython/wx/lib/masked/maskededit.py @@ -1919,8 +1919,7 @@ class MaskedEditMixin: width = self.GetSize().width height = self.GetBestSize().height ## dbg('setting client size to:', (width, height)) - self.SetSize((width, height)) - self.SetSizeHints((width, height)) + self.SetBestFittingSize((width, height)) # Set value/type-specific formatting self._applyFormatting() @@ -2002,7 +2001,7 @@ class MaskedEditMixin: # the outside size that does include the borders. What you are # calculating (in _CalcSize) is the client size, but the sizers # deal with the full size and so that is the minimum size that - # we need to set with SetSizeHints. The root of the problem is + # we need to set with SetBestFittingSize. The root of the problem is # that in _calcSize the current client size height is returned, # instead of a height based on the current font. So I suggest using # _calcSize to just get the width, and then use GetBestSize to @@ -2010,8 +2009,7 @@ class MaskedEditMixin: self.SetClientSize(self._CalcSize()) width = self.GetSize().width height = self.GetBestSize().height - self.SetSize((width, height)) - self.SetSizeHints((width, height)) + self.SetBestFittingSize((width, height)) # Set value/type-specific formatting diff --git a/wxPython/wx/lib/masked/textctrl.py b/wxPython/wx/lib/masked/textctrl.py index f232e2266a..fc20e71dc1 100644 --- a/wxPython/wx/lib/masked/textctrl.py +++ b/wxPython/wx/lib/masked/textctrl.py @@ -235,8 +235,7 @@ class BaseMaskedTextCtrl( wx.TextCtrl, MaskedEditMixin ): width = self.GetSize().width height = self.GetBestSize().height ## dbg('setting client size to:', (width, height)) - self.SetSize((width, height)) - self.SetSizeHints((width, height)) + self.SetBestFittingSize((width, height)) def Clear(self): diff --git a/wxPython/wx/lib/scrolledpanel.py b/wxPython/wx/lib/scrolledpanel.py index 006cbc8733..851d9332fa 100644 --- a/wxPython/wx/lib/scrolledpanel.py +++ b/wxPython/wx/lib/scrolledpanel.py @@ -38,7 +38,7 @@ class ScrolledPanel( wx.PyScrolledWindow ): wx.PyScrolledWindow.__init__(self, parent, -1, pos=pos, size=size, style=style, name=name) - self.SetBestSize(size) + self.SetBestFittingSize(size) self.Bind(wx.EVT_CHILD_FOCUS, self.OnChildFocus) diff --git a/wxPython/wx/lib/statbmp.py b/wxPython/wx/lib/statbmp.py index f0e0ff488c..fa2db42356 100644 --- a/wxPython/wx/lib/statbmp.py +++ b/wxPython/wx/lib/statbmp.py @@ -25,7 +25,7 @@ class GenStaticBitmap(wx.PyControl): wx.DefaultValidator, name) self._bitmap = bitmap self.InheritAttributes() - self.SetBestSize(size) + self.SetBestFittingSize(size) self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_PAINT, self.OnPaint) @@ -33,7 +33,7 @@ class GenStaticBitmap(wx.PyControl): def SetBitmap(self, bitmap): self._bitmap = bitmap - self.SetBestSize( (bitmap.GetWidth(), bitmap.GetHeight()) ) + self.SetBestFittingSize( (bitmap.GetWidth(), bitmap.GetHeight()) ) self.Refresh() diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py index 1c1ac8fca4..ac50f76e73 100644 --- a/wxPython/wx/lib/stattext.py +++ b/wxPython/wx/lib/stattext.py @@ -34,7 +34,7 @@ class GenStaticText(wx.PyControl): wx.PyControl.SetLabel(self, label) # don't check wx.ST_NO_AUTORESIZE yet self.defBackClr = self.GetBackgroundColour() self.InheritAttributes() - self.SetBestSize(size) + self.SetBestFittingSize(size) self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_PAINT, self.OnPaint) @@ -50,7 +50,7 @@ class GenStaticText(wx.PyControl): if not style & wx.ST_NO_AUTORESIZE: best = self.GetBestSize() self.SetSize(best) - self.SetSizeHints(best) + self.SetMinSize(best) self.Refresh() @@ -64,7 +64,7 @@ class GenStaticText(wx.PyControl): if not style & wx.ST_NO_AUTORESIZE: best = self.GetBestSize() self.SetSize(best) - self.SetSizeHints(best) + self.SetMinSize(best) self.Refresh() -- 2.47.2