X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1673e527f08395de6864b09540162ca409a3c28..9534c0039b9d708c7c0ab961f74c1b14f3bfec4c:/src/mac/carbon/stattext.cpp?ds=sidebyside

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index c0217bb8ae..d0285e6b06 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -75,7 +75,7 @@ wxSize wxStaticText::DoGetBestSize() const
 {
     Rect bestsize = { 0 , 0 , 0 , 0 } ;
     Point bounds;
-    
+
     // try the built-in best size if available
     Boolean former = m_peer->GetData<Boolean>( kControlStaticTextIsMultilineTag);
     m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
@@ -92,10 +92,10 @@ wxSize wxStaticText::DoGetBestSize() const
         OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
-        SInt16 baseline;
-        wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
+        wxCFStringRef str( m_label,  GetFont().GetEncoding() );
 
-#ifndef __LP64__
+#if wxMAC_USE_ATSU_TEXT
+        SInt16 baseline;
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
             err = GetThemeTextDimensions(
@@ -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 );
 }