X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00500f403cff8f1596157337b23fe2b40d51452b..b1a1a83c929126a9183a7e1f93646484bbd95b1b:/src/mac/carbon/stattext.cpp?ds=sidebyside diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 62e095f5fa..0884349c13 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// // Name: stattext.cpp // Purpose: wxStaticText -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // 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" @@ -20,241 +20,119 @@ #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" -BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase) - EVT_PAINT(wxStaticText::OnPaint) -END_EVENT_TABLE() -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 ) { - SetName(name); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_macIsUserPane = false; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + m_label = wxStripMenuCodes( label ); - m_windowStyle = style; - m_label = label ; + if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) + return false; - bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name ); - SetBestSize( size ) ; - - return ret; -} + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + wxMacCFStringHolder str( m_label, m_font.GetEncoding() ); -const wxString punct = " ,.-;:!?"; + m_peer = new wxMacControl( this ); + OSStatus err = CreateStaticTextControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, str, NULL, m_peer->GetControlRefAddr() ); + verify_noerr( err ); -void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph) -{ - int x = 0 ; - int y = 0 ; - int i = 0 ; - long width, height ; - bool linedrawn = true; - while( paragraph.Length() > 0 ) - { - dc.GetTextExtent( paragraph , &width , &height ) ; - - if ( width > m_width ) - { - for ( int p = paragraph.Length() -1 ; p > 0 ; --p ) - { - if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) - { - int blank = (paragraph[p] == ' ') ? 0 : 1; - - dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ; - - if ( width <= m_width ) - { - int pos = x ; - if ( HasFlag( wxALIGN_CENTER ) ) - { - pos += ( m_width - width ) / 2 ; - } - else if ( HasFlag( wxALIGN_RIGHT ) ) - { - pos += ( m_width - width ) ; - } - - dc.DrawText( paragraph.Left(p + blank), pos , y) ; - y += height ; - paragraph = paragraph.Mid(p+1) ; - linedrawn = true; - break ; - } - } - } - - linedrawn = false; - } - else - { - int pos = x ; - if ( HasFlag( wxALIGN_CENTER ) ) - { - pos += ( m_width - width ) / 2 ; - } - else if ( HasFlag( wxALIGN_RIGHT ) ) - { - pos += ( m_width - width ) ; - } - - dc.DrawText( paragraph, pos , y) ; - paragraph=""; - y += height ; - } - } + MacPostControlCreate( pos, size ); + + return true; } -void wxStaticText::OnDraw( wxDC &dc ) +wxSize wxStaticText::DoGetBestSize() const { - if (m_width <= 0 || m_height <= 0) - return; + ControlFontStyleRec controlFont; + OSStatus err = m_peer->GetData( kControlEntireControl, kControlFontStyleTag, &controlFont ); + verify_noerr( err ); - wxString paragraph; - int i = 0 ; - wxString text = m_label; - - int major,minor; - wxGetOsVersion( &major, &minor ); + Point bounds; + SInt16 baseline; + wxMacCFStringHolder str( m_label, m_font.GetEncoding() ); - PrepareDC(dc); - - bool doClear = true ; - WindowRef window = GetMacRootWindow() ; - if ( window ) + if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont ) { - wxWindow* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - wxWindow* parent = GetParent() ; - while ( parent ) - { - if( parent->MacGetWindowData() ) - { - break ; - } - - if (major < 10) - { - if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - if ( ((wxControl*)parent)->GetMacControl() ) { - Rect rect = { -10000 , -10000 , 10000 , 10000 } ; // MacOS X was having a coord rollover - if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress ) - { - DrawThemeTabPane ( &rect, kThemeStateActive); - doClear = false ; - } - } - break ; - } - } - - parent = parent->GetParent() ; - } - } + err = GetThemeTextDimensions( + (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")), + m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline ); + verify_noerr( err ); } - - if ( (major < 10) && doClear ) - dc.Clear() ; - - while (i < text.Length()) + else { - paragraph += text[i]; - - if (text[i] == 13 || text[i] == 10) - DrawParagraph(dc, paragraph); - - ++i; - } - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph); + 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 ); + verify_noerr( err ); + } + + if ( m_label.Length() == 0 ) + bounds.h = 0 ; + + bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize(); + bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize(); + + return wxSize( bounds.h, bounds.v ); } -void wxStaticText::OnPaint( wxPaintEvent &event ) +void wxStaticText::SetLabel( const wxString& st ) { - wxPaintDC dc(this); - OnDraw( dc ) ; + m_label = wxStripMenuCodes( st ); + + wxMacCFStringHolder str( m_label, m_font.GetEncoding() ); + CFStringRef ref = str; + OSStatus err = m_peer->SetData(kControlEntireControl, kControlStaticTextCFStringTag, ref ); + verify_noerr( err ); + + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + { + InvalidateBestSize(); + SetSize( GetBestSize() ); + } + + Refresh(); + + // we shouldn't need forced updates + // Update() ; } -wxSize wxStaticText::DoGetBestSize() const +bool wxStaticText::SetFont(const wxFont& font) { - int x,y ; - int widthTextMax = 0, widthLine, - heightTextTotal = 0, heightLineDefault = 0, heightLine = 0; - - wxString curLine; - for ( const wxChar *pc = m_label; ; pc++ ) + bool ret = wxControl::SetFont( font ); + + if ( ret ) { - if ( *pc == wxT('\n') || *pc == wxT('\0') ) + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) { - if ( !curLine ) - { - // we can't use GetTextExtent - it will return 0 for both width - // and height and an empty line should count in height - // calculation - if ( !heightLineDefault ) - heightLineDefault = heightLine; - if ( !heightLineDefault ) - GetTextExtent(_T("W"), NULL, &heightLineDefault); - - heightTextTotal += heightLineDefault; - - heightTextTotal++; // FIXME: why is this necessary? - } - else - { - GetTextExtent(curLine, &widthLine, &heightLine); - if ( widthLine > widthTextMax ) - widthTextMax = widthLine; - heightTextTotal += heightLine; - - heightTextTotal++; // FIXME: why is this necessary? - } - - if ( *pc == wxT('\n') ) { - curLine.Empty(); - } - else { - // the end of string - break; - } - } - else { - curLine += *pc; + InvalidateBestSize(); + SetSize( GetBestSize() ); } } - return wxSize(widthTextMax, heightTextTotal); + return ret; } -void wxStaticText::SetLabel(const wxString& st ) -{ - SetTitle( st ) ; - m_label = st ; - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ) ; +#endif //if wxUSE_STATTEXT - Refresh() ; - MacUpdateImmediately() ; -// wxClientDC dc(this); -// OnDraw( dc ) ; -}