border handling streamlined

[wxWidgets.git] / wxPython / wx / lib / stattext.py

diff --git a/wxPython/wx/lib/stattext.py b/wxPython/wx/lib/stattext.py
index 1c1ac8fca4c35b1f22ac658f726d8d28faabc149..ac50f76e733266a902a02ebd16a48ff30cf0f4ae 100644 (file)
--- 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()
         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)
 
         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)
         if not style & wx.ST_NO_AUTORESIZE:
             best = self.GetBestSize()
             self.SetSize(best)

-            self.SetSizeHints(best)
+            self.SetMinSize(best)

         self.Refresh()
 
 
         self.Refresh()
 
 


@@ -64,7 +64,7 @@ class GenStaticText(wx.PyControl):
         if not style & wx.ST_NO_AUTORESIZE:
             best = self.GetBestSize()
             self.SetSize(best)
         if not style & wx.ST_NO_AUTORESIZE:
             best = self.GetBestSize()
             self.SetSize(best)

-            self.SetSizeHints(best)
+            self.SetMinSize(best)

         self.Refresh()
 
 
         self.Refresh()