/////////////////////////////////////////////////////////////////////////////
// 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
/////////////////////////////////////////////////////////////////////////////
long style,
const wxString& name)
{
- SetName(name);
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
+ m_label = wxStripMenuCodes(label) ;
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- 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;
+
+ return true;
}
-const wxString punct = " ,.-;:!?";
+const wxString punct = wxT(" ,.-;:!?");
-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
{
- int x = 0 ;
- int y = 0 ;
- int i = 0 ;
- long width, height ;
- bool linedrawn = true;
- while( paragraph.Length() > 0 )
- {
+ long width, height ;
+
+ if (paragraph.Length() == 0)
+ {
+ // empty line
+ dc.GetTextExtent( wxT("H"), &width, &height );
+ y += height;
+
+ return;
+ }
+
+ int x = 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 )
- {
- if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
+ for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )
+ {
+ 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 ;
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 ;
}
}
}
{
if (m_width <= 0 || m_height <= 0)
return;
-
- if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
- ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE )
- || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
- {
- dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
- }
- else
- {
- dc.SetTextForeground( GetForegroundColour() ) ;
- }
-
- wxString paragraph;
- int i = 0 ;
- wxString text = m_label;
- 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);
+ /*
+ 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;
+ 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 ) ;
wxSize wxStaticText::DoGetBestSize() const
{
- 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') )
+ if ( *pc == wxT('\n') || *pc == wxT('\r') || *pc == wxT('\0') )
{
if ( !curLine )
{
GetTextExtent(_T("W"), NULL, &heightLineDefault);
heightTextTotal += heightLineDefault;
-
+
heightTextTotal++; // FIXME: why is this necessary?
}
else
if ( widthLine > widthTextMax )
widthTextMax = widthLine;
heightTextTotal += heightLine;
-
+
heightTextTotal++; // FIXME: why is this necessary?
}
- if ( *pc == wxT('\n') ) {
+ if ( *pc == wxT('\n') || *pc == wxT('\r')) {
curLine.Empty();
}
else {
void wxStaticText::SetLabel(const wxString& st )
{
- SetTitle( st ) ;
- m_label = st ;
- if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
- SetSize( GetBestSize() ) ;
+ 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() ;
+}
+
+bool wxStaticText::SetFont(const wxFont& font)
+{
+ bool ret = wxControl::SetFont(font);
- Refresh() ;
- Update() ;
+ 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;
}
projects / wxWidgets.git / blobdiff