X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a49afa93ca428a2236d5bc76f628241036f01629..adb45366da2cb1ee72f548ab2fa149f071327682:/src/mac/stattext.cpp
diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 33e784261d..9a56b744e2 100644
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -15,8 +15,12 @@
#include "wx/app.h"
#include "wx/stattext.h"
+#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 <stdio.h>
@@ -24,9 +28,9 @@
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
#endif
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
+BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
EVT_PAINT(wxStaticText::OnPaint)
END_EVENT_TABLE()
@@ -42,169 +46,138 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
m_foregroundColour = parent->GetForegroundColour() ;
if ( id == -1 )
- m_windowId = (int)NewControlId();
+ m_windowId = (int)NewControlId();
else
- m_windowId = id;
+ m_windowId = id;
m_windowStyle = style;
- m_label = label ;
+ m_label = wxStripMenuCodes(label) ;
+
+ bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+ SetBestSize( size ) ;
- bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
- SetSizeOrDefault( size ) ;
-
return ret;
}
+const wxString punct = " ,.-;:!?";
+
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
+{
+ long width, height ;
+
+ if (paragraph.Length() == 0)
+ {
+ // empty line
+ dc.GetTextExtent( "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 ( size_t 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 ;
+ }
+ }
+}
+
void wxStaticText::OnDraw( wxDC &dc )
{
if (m_width <= 0 || m_height <= 0)
return;
-
- PrepareDC(dc);
+/*
dc.Clear() ;
-
- int x = 0 ;
- int y = 0 ;
- wxString text = m_label ;
- wxString paragraph ;
- int i = 0 ;
- int laststop = 0 ;
- long width, height ;
-
- while( i < text.Length() )
- {
- if( text[i] == 13 || text[i] == 10)
- {
- paragraph = text.Mid( laststop , i - laststop ) ;
- while( paragraph.Length() > 0 )
- {
- dc.GetTextExtent( paragraph , &width , &height ) ;
- if ( width > m_width )
- {
- for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
- {
- if ( paragraph[p]=='.' )
- {
- dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
- y += height ;
- paragraph = paragraph.Mid(p+1) ;
- break ;
- }
- }
- if ( paragraph[p]==' ' )
- {
- dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
- y += height ;
- paragraph = paragraph.Mid(p+1) ;
- break ;
- }
- }
- }
- }
- else
- {
- dc.DrawText( paragraph, x , y) ;
- paragraph="";
- y += height ;
- }
- }
- laststop = i+1 ;
- }
- ++i ;
- }
- paragraph = text.Mid( laststop , text.Length() - laststop ) ;
- while( paragraph.Length() > 0 )
- {
- dc.GetTextExtent( paragraph , &width , &height ) ;
- if ( width > m_width )
- {
- for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
- {
- if ( paragraph[p]=='.' )
- {
- dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
- y += height ;
- paragraph = paragraph.Mid(p+1) ;
- break ;
- }
- }
- if ( paragraph[p]==' ' )
- {
- dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
- y += height ;
- paragraph = paragraph.Mid(p+1) ;
- break ;
- }
- }
- }
- }
- 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 ;
- }
- }
+ 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 = "" ;
+ }
+ 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 ) ;
@@ -212,14 +185,16 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
wxSize wxStaticText::DoGetBestSize() const
{
- int x , y ;
- int widthTextMax = 0, widthLine,
+ 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 ( !curLine ) {
+ for ( const wxChar *pc = m_label; ; pc++ )
+ {
+ if ( *pc == wxT('\n') || *pc == wxT('\0') )
+ {
+ 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
@@ -229,12 +204,17 @@ wxSize wxStaticText::DoGetBestSize() const
GetTextExtent(_T("W"), NULL, &heightLineDefault);
heightTextTotal += heightLineDefault;
+
+ heightTextTotal++; // FIXME: why is this necessary?
}
- else {
+ else
+ {
GetTextExtent(curLine, &widthLine, &heightLine);
if ( widthLine > widthTextMax )
widthTextMax = widthLine;
heightTextTotal += heightLine;
+
+ heightTextTotal++; // FIXME: why is this necessary?
}
if ( *pc == wxT('\n') ) {
@@ -255,13 +235,23 @@ wxSize wxStaticText::DoGetBestSize() const
void wxStaticText::SetLabel(const wxString& st )
{
- SetTitle( st ) ;
- m_label = st ;
- if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
- SetSizeOrDefault() ;
-
- Refresh() ;
- MacUpdateImmediately() ;
-// wxClientDC dc(this);
-// OnDraw( dc ) ;
+ SetTitle( st ) ;
+ m_label = st ;
+ if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+ SetSize( GetBestSize() ) ;
+
+ Refresh() ;
+ Update() ;
+}
+
+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() );
+
+ return ret;
}