X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ca0d8122ab2ecbce178aa9f21f13270c4ffaca0..93a2b888fcbc81aa1c97df976ff0b151b2233abd:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 93998884fd..3c67c64a9a 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,9 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "stattext.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_STATTEXT
 
 #include "wx/app.h"
 #include "wx/stattext.h"
@@ -24,9 +24,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -49,7 +47,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
         NULL , m_peer->GetControlRefAddr() ) ) ;  
 
@@ -78,6 +76,9 @@ wxSize wxStaticText::DoGetBestSize() const
     }
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;
+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
     return wxSize(bounds.h, bounds.v);
 }
 
@@ -95,8 +96,9 @@ void wxStaticText::SetLabel(const wxString& st )
         InvalidateBestSize();
         SetSize( GetBestSize() ) ;
     }
-
-    Update() ;
+    Refresh() ;
+    // we shouldn't need forced updates
+    // Update() ;
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
@@ -106,11 +108,14 @@ bool wxStaticText::SetFont(const wxFont& font)
 	if ( ret )
 	{
 	    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-            {
-                InvalidateBestSize();
-	        SetSize( GetBestSize() );
-            }
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
 	}
 
     return ret;
 }
+
+#endif //if wxUSE_STATTEXT
+