X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index e2bd22ed23..16e9aca2fb 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -49,8 +49,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    m_peer = new wxMacControl() ;
     verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
-        NULL , (ControlRef*)&m_macControl ) ) ;  
+        NULL , m_peer->GetControlRefAddr() ) ) ;  
 
     MacPostControlCreate(pos,size) ;
 
@@ -60,8 +61,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 wxSize wxStaticText::DoGetBestSize() const
 {
     ControlFontStyleRec controlFont ;
-    Size outSize ;
-    verify_noerr( GetControlData( (ControlRef) m_macControl , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
+    verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
     
     Point bounds ;
     SInt16 baseline ;
@@ -78,6 +78,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);
 }
 
@@ -88,15 +91,14 @@ void wxStaticText::SetLabel(const wxString& st )
     
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
     CFStringRef ref = str ;
-    SetControlData( (ControlRef) m_macControl, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
-		&ref );
+    verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
+        InvalidateBestSize();
         SetSize( GetBestSize() ) ;
-        SetSizeHints(GetSize());
     }
-
+    Refresh() ;
     Update() ;
 }
 
@@ -107,10 +109,10 @@ bool wxStaticText::SetFont(const wxFont& font)
 	if ( ret )
 	{
 	    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-            {
-	        SetSize( GetBestSize() );
-                SetSizeHints(GetSize());
-            }
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
 	}
 
     return ret;