X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28c98a77e93d2f3d4254dc757c431c523070e89d..163dc80eff2faed2c3c1fb3ee6b46eb5ae9d70f9:/src/mac/carbon/stattext.cpp diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index bc89591282..4c8b9414a4 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // 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 ///////////////////////////////////////////////////////////////////////////// @@ -41,25 +41,20 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - SetName(name); - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - m_windowStyle = style; m_label = wxStripMenuCodes(label) ; - bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name ); + if ( !wxControl::Create( parent, id, pos, size, style, + wxDefaultValidator , name ) ) + { + return false; + } + SetBestSize( size ) ; - return ret; + return true; } -const wxString punct = " ,.-;:!?"; +const wxString punct = wxT(" ,.-;:!?"); void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y) { @@ -68,51 +63,50 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y) if (paragraph.Length() == 0) { // empty line - dc.GetTextExtent( "H", &width, &height ); + dc.GetTextExtent( wxT("H"), &width, &height ); y += height; return; } - int x = 0 ; + int x = 0 ; - int i = 0 ; - bool linedrawn = true; - while( paragraph.Length() > 0 ) - { + 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 ) + for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p ) { - if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) + if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn) { - int blank = (paragraph[p] == ' ') ? 0 : 1; - + 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 ; + } + + dc.DrawText( paragraph.Left(p + blank), pos , y) ; + y += height ; paragraph = paragraph.Mid(p+1) ; linedrawn = true; break ; } } } - + linedrawn = false; } else @@ -121,15 +115,15 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y) 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 ; + } + + dc.DrawText( paragraph, pos , y) ; + paragraph=wxEmptyString; + y += height ; } } } @@ -138,47 +132,47 @@ void wxStaticText::OnDraw( wxDC &dc ) { if (m_width <= 0 || m_height <= 0) return; -/* - dc.Clear() ; - wxRect rect(0,0,m_width,m_height) ; - dc.SetFont(*wxSMALL_FONT) ; - - dc.DrawRectangle(rect) ; -*/ - if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && - ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) - || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) - { - dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ; - } - else - { - dc.SetTextForeground( GetForegroundColour() ) ; - } - - wxString paragraph; - int i = 0 ; - wxString text = m_label; - int y = 0 ; - while (i < text.Length()) - { - - if (text[i] == 13 || text[i] == 10) + /* + dc.Clear() ; + wxRect rect(0,0,m_width,m_height) ; + dc.SetFont(*wxSMALL_FONT) ; + + dc.DrawRectangle(rect) ; + */ + if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && + ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) + || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) { - DrawParagraph(dc, paragraph,y); - paragraph = "" ; + dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ; } else { - paragraph += text[i]; + dc.SetTextForeground( GetForegroundColour() ) ; } - ++i; - } - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph,y); + + wxString paragraph; + size_t i = 0 ; + wxString text = m_label; + int y = 0 ; + while (i < text.Length()) + { + + if (text[i] == 13 || text[i] == 10) + { + DrawParagraph(dc, paragraph,y); + paragraph = wxEmptyString ; + } + else + { + paragraph += text[i]; + } + ++i; + } + if (paragraph.Length() > 0) + DrawParagraph(dc, paragraph,y); } -void wxStaticText::OnPaint( wxPaintEvent &event ) +void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) ) { wxPaintDC dc(this); OnDraw( dc ) ; @@ -239,8 +233,11 @@ void wxStaticText::SetLabel(const wxString& st ) SetTitle( st ) ; m_label = st ; if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + { + // temporary fix until layout measurement and drawing are in synch again + Refresh() ; SetSize( GetBestSize() ) ; - + } Refresh() ; Update() ; } @@ -249,10 +246,17 @@ bool wxStaticText::SetFont(const wxFont& font) { bool ret = wxControl::SetFont(font); - // adjust the size of the window to fit to the label unless autoresizing is - // disabled - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ); + if ( ret ) + { + // adjust the size of the window to fit to the label unless autoresizing is + // disabled + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + { + // temporary fix until layout measurement and drawing are in synch again + Refresh() ; + SetSize( GetBestSize() ); + } + } return ret; }