splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 19740c7daa8641fc4a07c1d6f3c23f55d94c1c7d..d2f9fd1ceaef0a167d715985ce978da64da5f50d 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -92,7 +92,7 @@ wxSize wxStaticText::DoGetBestSize() const
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
-        wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
+        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
 
 #if wxMAC_USE_ATSU_TEXT
         SInt16 baseline;
@@ -179,7 +179,7 @@ void wxStaticText::DoSetLabel(const wxString& label)
     m_labelOrig = label;
     m_label = RemoveMnemonics(label);
 
-    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+    wxCFStringRef str( m_label, GetFont().GetEncoding() );
     OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, str);
     verify_noerr( err );
 }