X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43524b1583cbe798351fef03242f0990e1cfddc2..a8b2285edf2eb1ef1dd1cb19abf130a871821dbf:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 0884349c13..be737ac8be 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/mac/carbon/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      Stefan Csomor
 // Modified by:
@@ -13,14 +13,18 @@
 
 #if wxUSE_STATTEXT
 
-#include "wx/app.h"
 #include "wx/stattext.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #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/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/settings.h"
 
 #include "wx/mac/uma.h"
 
@@ -39,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;
@@ -53,6 +57,16 @@ bool wxStaticText::Create( wxWindow *parent,
         &bounds, str, NULL, m_peer->GetControlRefAddr() );
     verify_noerr( err );
 
+    if ( ( style & wxST_DOTS_END ) || ( style & wxST_DOTS_MIDDLE ) )
+    {
+        TruncCode tCode = truncEnd;
+        if ( style & wxST_DOTS_MIDDLE )
+            tCode = truncMiddle;
+
+        err = m_peer->SetData( kControlStaticTextTruncTag, tCode );
+        err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+    }
+
     MacPostControlCreate( pos, size );
 
     return true;
@@ -60,37 +74,56 @@ bool wxStaticText::Create( wxWindow *parent,
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-    ControlFontStyleRec controlFont;
-    OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
-    verify_noerr( err );
-
+    Rect bestsize = { 0 , 0 , 0 , 0 } ;
     Point bounds;
-    SInt16 baseline;
-    wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
-
-    if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+    
+    // try the built-in best size if available
+    m_peer->GetBestRect( &bestsize ) ;
+    if ( !EmptyRect( &bestsize ) )
     {
-        err = GetThemeTextDimensions(
-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
-            m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
-        verify_noerr( err );
+        bounds.h = bestsize.right - bestsize.left ;
+        bounds.v = bestsize.bottom - bestsize.top ;
     }
     else
     {
-        wxMacWindowStateSaver sv( this );
-        ::TextFont( m_font.MacGetFontNum() );
-        ::TextSize( (short)(m_font.MacGetFontSize()) );
-        ::TextFace( m_font.MacGetFontStyle() );
-
-        err = GetThemeTextDimensions(
-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
-            kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
+        ControlFontStyleRec controlFont;
+        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
-    }
 
-    if ( m_label.Length() == 0 )
-        bounds.h = 0 ;
+        SInt16 baseline;
+        wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
 
+        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        {
+            err = GetThemeTextDimensions(
+                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
+                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
+            verify_noerr( err );
+        }
+        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()) );
+            ::TextFace( m_font.MacGetFontStyle() );
+
+            err = GetThemeTextDimensions(
+                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
+                kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
+            verify_noerr( err );
+    #endif
+        }
+
+        if ( m_label.empty() )
+            bounds.h = 0;
+    }
     bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
     bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
 
@@ -99,7 +132,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;
@@ -115,7 +148,7 @@ void wxStaticText::SetLabel( const wxString& st )
     Refresh();
 
     // we shouldn't need forced updates
-    // Update() ;
+    // Update();
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
@@ -135,4 +168,3 @@ bool wxStaticText::SetFont(const wxFont& font)
 }
 
 #endif //if wxUSE_STATTEXT
-