X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed4b0fdca60e017afe72c55940799ce0fed925f0..1c104648931c9e1b52b243732d9dacf28703f5dc:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 1aea449abc..21ed1ed771 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -20,11 +20,11 @@
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/dcclient.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 
@@ -43,7 +43,7 @@ bool wxStaticText::Create( wxWindow *parent,
 {
     m_macIsUserPane = false;
 
-    m_label = wxStripMenuCodes( label );
+    m_label = GetLabelText( label );
 
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
@@ -91,6 +91,13 @@ wxSize wxStaticText::DoGetBestSize() const
     }
     else
     {
+#if wxMAC_USE_CORE_GRAPHICS
+        wxClientDC dc(const_cast<wxStaticText*>(this));
+        wxCoord width, height ;
+        dc.GetTextExtent( m_label , &width, &height);
+        bounds.h = width;
+        bounds.v = height;
+#else
         wxMacWindowStateSaver sv( this );
         ::TextFont( m_font.MacGetFontNum() );
         ::TextSize( (short)(m_font.MacGetFontSize()) );
@@ -100,6 +107,7 @@ wxSize wxStaticText::DoGetBestSize() const
             (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
             kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
+#endif
     }
 
     if ( m_label.empty() )
@@ -113,7 +121,7 @@ wxSize wxStaticText::DoGetBestSize() const
 
 void wxStaticText::SetLabel( const wxString& st )
 {
-    m_label = wxStripMenuCodes( st );
+    m_label = GetLabelText( st );
 
     wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
     CFStringRef ref = str;