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

fixed redrawing bug

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-11 06:53:27 +00:00
parent 402679b0f8
commit 7595f3811e
2 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,10 +61,10 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
const wxString punct = " ,.-;:!?"; const wxString punct = " ,.-;:!?";
void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph) void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
{ {
int x = 0 ; int x = 0 ;
int y = 0 ;
int i = 0 ; int i = 0 ;
long width, height ; long width, height ;
bool linedrawn = true; bool linedrawn = true;
@@ -128,7 +128,13 @@ void wxStaticText::OnDraw( wxDC &dc )
{ {
if (m_width <= 0 || m_height <= 0) if (m_width <= 0 || m_height <= 0)
return; return;
/*
dc.Clear() ;
wxRect rect(0,0,m_width,m_height) ;
dc.SetFont(*wxSMALL_FONT) ;
dc.DrawRectangle(rect) ;
*/
if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
|| GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
@@ -143,17 +149,23 @@ void wxStaticText::OnDraw( wxDC &dc )
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;
while (i < text.Length()) int y = 0 ;
{ while (i < text.Length())
paragraph += text[i]; {
if (text[i] == 13 || text[i] == 10) if (text[i] == 13 || text[i] == 10)
DrawParagraph(dc, paragraph); {
DrawParagraph(dc, paragraph,y);
paragraph = "" ;
}
else
{
paragraph += text[i];
}
++i; ++i;
} }
if (paragraph.Length() > 0) if (paragraph.Length() > 0)
DrawParagraph(dc, paragraph); DrawParagraph(dc, paragraph,y);
} }
void wxStaticText::OnPaint( wxPaintEvent &event ) void wxStaticText::OnPaint( wxPaintEvent &event )

30
src/mac/stattext.cpp
View File

@@ -61,10 +61,10 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
const wxString punct = " ,.-;:!?"; const wxString punct = " ,.-;:!?";
void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph) void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
{ {
int x = 0 ; int x = 0 ;
int y = 0 ;
int i = 0 ; int i = 0 ;
long width, height ; long width, height ;
bool linedrawn = true; bool linedrawn = true;
@@ -128,7 +128,13 @@ void wxStaticText::OnDraw( wxDC &dc )
{ {
if (m_width <= 0 || m_height <= 0) if (m_width <= 0 || m_height <= 0)
return; return;
/*
dc.Clear() ;
wxRect rect(0,0,m_width,m_height) ;
dc.SetFont(*wxSMALL_FONT) ;
dc.DrawRectangle(rect) ;
*/
if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
|| GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) ) || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
@@ -143,17 +149,23 @@ void wxStaticText::OnDraw( wxDC &dc )
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;
while (i < text.Length()) int y = 0 ;
{ while (i < text.Length())
paragraph += text[i]; {
if (text[i] == 13 || text[i] == 10) if (text[i] == 13 || text[i] == 10)
DrawParagraph(dc, paragraph); {
DrawParagraph(dc, paragraph,y);
paragraph = "" ;
}
else
{
paragraph += text[i];
}
++i; ++i;
} }
if (paragraph.Length() > 0) if (paragraph.Length() > 0)
DrawParagraph(dc, paragraph); DrawParagraph(dc, paragraph,y);
} }
void wxStaticText::OnPaint( wxPaintEvent &event ) void wxStaticText::OnPaint( wxPaintEvent &event )