Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAcOS X clears the background (with stripes) for

Browse Source 
us, so there is no need to do it again. This
    solves to optical bugs for the wxStatusBar and
    wxStaticText.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-12-17 09:42:22 +00:00
parent d21d2e5adf
commit 00500f403c
5 changed files with 493 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
src/mac/carbon/stattext.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) AUTHOR
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -19,6 +19,7 @@
#include "wx/tabctrl.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"
#include <stdio.h>
@@ -44,15 +45,15 @@ 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 ;
bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
SetBestSize( size ) ;
bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
SetBestSize( size ) ;
return ret;
}
@@ -68,58 +69,58 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
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 ;
}
}
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 ;
}
}
}
void wxStaticText::OnDraw( wxDC &dc )
@@ -127,58 +128,65 @@ void wxStaticText::OnDraw( wxDC &dc )
if (m_width <= 0 || m_height <= 0)
return;
wxString paragraph;
int i = 0 ;
wxString text = m_label;
wxString paragraph;
int i = 0 ;
wxString text = m_label;
int major,minor;
wxGetOsVersion( &major, &minor );
PrepareDC(dc);
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 = { -10000 , -10000 , 10000 , 10000 } ; // MacOS X was having a coord rollover
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);
WindowRef window = GetMacRootWindow() ;
if ( window )
{
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() ;
}
}
}
if ( (major < 10) && 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);
DrawParagraph(dc, paragraph);
}
void wxStaticText::OnPaint( wxPaintEvent &event )
@@ -189,7 +197,7 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
wxSize wxStaticText::DoGetBestSize() const
{
int x,y ;
int x,y ;
int widthTextMax = 0, widthLine,
heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
@@ -240,13 +248,13 @@ wxSize wxStaticText::DoGetBestSize() const
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) )
SetSize( GetBestSize() ) ;
Refresh() ;
MacUpdateImmediately() ;
Refresh() ;
MacUpdateImmediately() ;
// wxClientDC dc(this);
// OnDraw( dc ) ;
}