X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1348e1a5d9c2872a0c29a9cd3d1a4a35c998eeae..f80ffb32eb597f7b051ed1705c72b2934eb2eb30:/src/mac/carbon/stattext.cpp diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 86c4fd7158..16e9aca2fb 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: stattext.cpp // Purpose: wxStaticText -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -19,6 +19,8 @@ #include "wx/tabctrl.h" #include "wx/dc.h" #include "wx/dcclient.h" +#include "wx/utils.h" +#include "wx/settings.h" #include @@ -26,11 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) #endif -#include - -BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase) - EVT_PAINT(wxStaticText::OnPaint) -END_EVENT_TABLE() +#include "wx/mac/uma.h" bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, @@ -39,214 +37,83 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - SetName(name); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_macIsUserPane = FALSE ; + + m_label = wxStripMenuCodes(label) ; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + if ( !wxControl::Create( parent, id, pos, size, style, + wxDefaultValidator , name ) ) + { + return false; + } - m_windowStyle = style; - m_label = label ; + 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->GetControlRefAddr() ) ) ; - bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name ); - SetBestSize( size ) ; - - return ret; -} + MacPostControlCreate(pos,size) ; -const wxString punct = " ,.-;:!?"; + return true; +} -void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph) +wxSize wxStaticText::DoGetBestSize() const { - 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 ; - } - } + ControlFontStyleRec controlFont ; + verify_noerr( m_peer->GetData(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ; + + 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 ) ) ; + 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 ) ) ; + } + if ( m_label.Length() == 0 ) + bounds.h = 0 ; + + bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ; + bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ; + return wxSize(bounds.h, bounds.v); } -void wxStaticText::OnDraw( wxDC &dc ) +void wxStaticText::SetLabel(const wxString& st ) { - if (m_width <= 0 || m_height <= 0) - return; - wxString paragraph; - int i = 0 ; - wxString text = m_label; - - PrepareDC(dc); + m_label = wxStripMenuCodes(st) ; - bool doClear = true ; - WindowRef window = GetMacRootWindow() ; - if ( window ) - { - wxWindow* win = wxFindWinFromMacWindow( window ) ; - if ( win ) - { - wxWindow* parent = GetParent() ; - while ( parent ) - { - if( parent->MacGetWindowData() ) - { - break ; - } - - if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - if ( ((wxControl*)parent)->GetMacControl() ) { - Rect rect = { -32767 , -32767 , 32767 , 32767 } ; - if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress ) - { - DrawThemeTabPane ( &rect, kThemeStateActive); - doClear = false ; - } - } - break ; - } - - parent = parent->GetParent() ; - } - } - } - if ( doClear ) - dc.Clear() ; - - while (i < text.Length()) - { - paragraph += text[i]; - - if (text[i] == 13 || text[i] == 10) - DrawParagraph(dc, paragraph); - - ++i; - } - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph); -} + wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ; + CFStringRef ref = str ; + verify_noerr( m_peer->SetData(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ; -void wxStaticText::OnPaint( wxPaintEvent &event ) -{ - wxPaintDC dc(this); - OnDraw( dc ) ; + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + { + InvalidateBestSize(); + SetSize( GetBestSize() ) ; + } + Refresh() ; + 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++ ) - { - if ( *pc == wxT('\n') || *pc == wxT('\0') ) + bool ret = wxControl::SetFont(font); + + if ( ret ) + { + 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); -} + } -void wxStaticText::SetLabel(const wxString& st ) -{ - SetTitle( st ) ; - m_label = st ; - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ) ; - - Refresh() ; - MacUpdateImmediately() ; -// wxClientDC dc(this); -// OnDraw( dc ) ; + return ret; }