reverted m_adjustMinSize change prepatory for a new approach to fix

the problem git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-21 22:58:13 +00:00
parent 478ba84485
commit c0e6c05138
33 changed files with 119 additions and 125 deletions
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -92,9 +92,27 @@ void wxStaticText::SetLabel(const wxString& st )
    SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
 		&ref );

-    if (GetAdjustMinSizeFlag())
-        SetBestSize(wxDefaultSize);
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        SetSize( GetBestSize() ) ;
+        SetSizeHints(GetSize());
+    }

    Update() ;
 }

+bool wxStaticText::SetFont(const wxFont& font)
+{
+    bool ret = wxControl::SetFont(font);
+
+	if ( ret )
+	{
+	    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+            {
+	        SetSize( GetBestSize() );
+                SetSizeHints(GetSize());
+            }
+	}
+
+    return ret;
+}