X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43524b1583cbe798351fef03242f0990e1cfddc2..6aa68c25a4599f20186dca3604eee1597ddc7fc4:/src/mac/carbon/stattext.cpp?ds=sidebyside diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 0884349c13..b6bb94d019 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,8 +13,12 @@ #if wxUSE_STATTEXT -#include "wx/app.h" #include "wx/stattext.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" +#endif // WX_PRECOMP + #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/dc.h" @@ -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; @@ -71,7 +85,7 @@ wxSize wxStaticText::DoGetBestSize() const if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) { err = GetThemeTextDimensions( - (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")), + (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")), m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); verify_noerr( err ); } @@ -83,13 +97,13 @@ wxSize wxStaticText::DoGetBestSize() const ::TextFace( m_font.MacGetFontStyle() ); err = GetThemeTextDimensions( - (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")), + (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")), kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline ); verify_noerr( err ); } - if ( m_label.Length() == 0 ) - bounds.h = 0 ; + if ( m_label.empty() ) + bounds.h = 0; bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize(); bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize(); @@ -115,7 +129,7 @@ void wxStaticText::SetLabel( const wxString& st ) Refresh(); // we shouldn't need forced updates - // Update() ; + // Update(); } bool wxStaticText::SetFont(const wxFont& font) @@ -135,4 +149,3 @@ bool wxStaticText::SetFont(const wxFont& font) } #endif //if wxUSE_STATTEXT -