fixed loop deleting the old filters in SetWildcard() after last commit

[wxWidgets.git] / src / mac / classic / stattext.cpp

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index 8bc3ee927248f7bc9342fa53584e0008552b97ba..38c4b1041b61a11dd688129b59fe2f1e917e4981 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -232,11 +232,33 @@ void wxStaticText::SetLabel(const wxString& st )
 {
     SetTitle( st ) ;
     m_label = st ;
-
-    if (GetAdjustMinSizeFlag())
-        SetBestSize(wxDefaultSize);
-
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        // temporary fix until layout measurement and drawing are in synch again
+        Refresh() ;
+        InvalidateBestSize();
+        SetSize( GetBestSize() ) ;
+    }
     Refresh() ;
     Update() ;
 }
 
+bool wxStaticText::SetFont(const wxFont& font)
+{
+    bool ret = wxControl::SetFont(font);
+
+       if ( ret )
+       {
+           // adjust the size of the window to fit to the label unless autoresizing is
+           // disabled
+           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+           {
+               // temporary fix until layout measurement and drawing are in synch again
+                Refresh() ;
+                InvalidateBestSize();
+               SetSize( GetBestSize() );
+           }
+       }
+
+    return ret;
+}