X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21fd55291b631eae9ccfd78866616aca6e573ebe..90f58090f638b6e2b136e2cb61ad26d55c76747b:/src/mac/carbon/stattext.cpp diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index f4757d19d7..236c88000e 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: @@ -9,110 +9,198 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "stattext.h" -#endif +#include "wx/wxprec.h" + +#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" #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) -#endif -#include "wx/mac/uma.h" -bool wxStaticText::Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxStaticText::Create( wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { - m_macIsUserPane = FALSE ; - - m_label = wxStripMenuCodes(label) ; + m_macIsUserPane = false; - if ( !wxControl::Create( parent, id, pos, size, style, - wxDefaultValidator , name ) ) - { + if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; + + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + + m_peer = new wxMacControl( this ); + OSStatus err = CreateStaticTextControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, NULL, NULL, m_peer->GetControlRefAddr() ); + verify_noerr( err ); + + if ( ( style & wxST_ELLIPSIZE_END ) || ( style & wxST_ELLIPSIZE_MIDDLE ) ) + { + TruncCode tCode = truncEnd; + if ( style & wxST_ELLIPSIZE_MIDDLE ) + tCode = truncMiddle; + + err = m_peer->SetData( kControlStaticTextTruncTag, tCode ); + err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 ); } - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ; - m_peer = new wxMacControl() ; - verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , - NULL , *m_peer ) ) ; + MacPostControlCreate( pos, size ); - MacPostControlCreate(pos,size) ; + SetLabel(label); return true; } wxSize wxStaticText::DoGetBestSize() const { - ControlFontStyleRec controlFont ; - Size outSize ; - verify_noerr( GetControlData( *m_peer , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ; + Rect bestsize = { 0 , 0 , 0 , 0 } ; + Point bounds; - Point bounds ; - SInt16 baseline ; - wxMacCFStringHolder str(m_label , m_font.GetEncoding() ) ; - if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) - verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ; + // try the built-in best size if available + Boolean former = m_peer->GetData( kControlStaticTextIsMultilineTag); + m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 ); + m_peer->GetBestRect( &bestsize ) ; + m_peer->SetData( kControlStaticTextIsMultilineTag, former ); + if ( !EmptyRect( &bestsize ) ) + { + 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() ) ; - verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ; + ControlFontStyleRec controlFont; + OSStatus err = m_peer->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); + + 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(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; } - if ( m_label.Length() == 0 ) - bounds.h = 0 ; - return wxSize(bounds.h, bounds.v); + bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize(); + bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize(); + + return wxSize( bounds.h, bounds.v ); } -void wxStaticText::SetLabel(const wxString& st ) +void wxStaticText::SetLabel(const wxString& label) { + m_labelOrig = label; - m_label = wxStripMenuCodes(st) ; - - wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ; - CFStringRef ref = str ; - SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ), - &ref ); + // middle/end ellipsization is handled by the OS: + if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE) ) + { + // remove markup + wxString str(label); + if (HasFlag(wxST_MARKUP)) + str = RemoveMarkup(label); - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + // and leave ellipsization to the OS + DoSetLabel(str); + } + else // not supported natively { - SetSize( GetBestSize() ) ; - SetSizeHints(GetSize()); + DoSetLabel(GetEllipsizedLabelWithoutMarkup()); } - Update() ; + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) && + !IsEllipsized() ) // don't resize if we adjust to current size + { + InvalidateBestSize(); + SetSize( GetBestSize() ); + } + + Refresh(); + + // we shouldn't need forced updates + // Update(); } bool wxStaticText::SetFont(const wxFont& font) { - bool ret = wxControl::SetFont(font); + bool ret = wxControl::SetFont( font ); - if ( ret ) - { - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - { - SetSize( GetBestSize() ); - SetSizeHints(GetSize()); - } - } + if ( ret ) + { + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + { + InvalidateBestSize(); + SetSize( GetBestSize() ); + } + } return ret; } + + +// for wxST_ELLIPSIZE_* support: + +void wxStaticText::DoSetLabel(const wxString& label) +{ + m_label = RemoveMnemonics(label); + + wxMacCFStringHolder str( m_label, m_font.GetEncoding() ); + OSStatus err = m_peer->SetData(kControlEntireControl, kControlStaticTextCFStringTag, str); + verify_noerr( err ); +} + +wxString wxStaticText::DoGetLabel() const +{ + return m_label; +} + +/* + FIXME: UpdateLabel() should be called on size events when wxST_ELLIPSIZE_START is set + to allow correct dynamic ellipsizing of the label +*/ + +#endif //if wxUSE_STATTEXT