correct Stopping - go to start of movie if stopped - add in preliminary docs

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index c6a6dd4e1a5d430e43e8f5b770f2422f9b65bfdd..16e9aca2fb5d4d8e3bd5fc0c71cc94abbf7d1f97 100644 (file)
--- 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,15 +61,26 @@ 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 ;
     wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
-    verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    else
+    {
+        wxMacWindowStateSaver sv( this ) ;
+        ::TextFont( m_font.MacGetFontNum() ) ;
+        ::TextSize( (short)( m_font.MacGetFontSize()) ) ;
+        ::TextFace( m_font.MacGetFontStyle() ) ;        
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    }
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;
+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
     return wxSize(bounds.h, bounds.v);
 }
 
@@ -79,12 +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() ) ;
-
+    }
+    Refresh() ;
     Update() ;
 }
 
@@ -95,7 +109,10 @@ bool wxStaticText::SetFont(const wxFont& font)
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-               SetSize( GetBestSize() );
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
        }
 
     return ret;