Now works when derived from wxTextCtrlBase, using wxScrollHelper.

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

diff --git a/src/mac/classic/stattext.cpp b/src/mac/classic/stattext.cpp
index c1ba821386b6b8122730d6c0698f72e675a413ec..bdda2c708f6cc6f37cd55457183c3d5bbdc2ba3b 100644 (file)
--- a/src/mac/classic/stattext.cpp
+++ b/src/mac/classic/stattext.cpp
@@ -6,13 +6,9 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "stattext.h"
-#endif
-
 #include "wx/app.h"
 #include "wx/stattext.h"
 #include "wx/notebook.h"
@@ -24,9 +20,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -236,6 +230,7 @@ void wxStaticText::SetLabel(const wxString& st )
     {
         // temporary fix until layout measurement and drawing are in synch again
         Refresh() ;
+        InvalidateBestSize();
         SetSize( GetBestSize() ) ;
     }
     Refresh() ;
@@ -253,7 +248,8 @@ bool wxStaticText::SetFont(const wxFont& font)
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
            {
                // temporary fix until layout measurement and drawing are in synch again
-            Refresh() ;
+                Refresh() ;
+                InvalidateBestSize();
                SetSize( GetBestSize() );
            }
        }