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

removed clearing (done anyway)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-12-19 21:54:35 +00:00
parent cd9bcf8a6e
commit 607f6d2b4f
2 changed files with 40 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,29 +131,6 @@ void wxStaticText::OnDraw( wxDC &dc )
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;
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 ;
}
parent = parent->GetParent() ;
}
}
}
while (i < text.Length()) while (i < text.Length())
{ {
paragraph += text[i]; paragraph += text[i];
@@ -163,7 +140,6 @@ void wxStaticText::OnDraw( wxDC &dc )
++i; ++i;
} }
if (paragraph.Length() > 0) if (paragraph.Length() > 0)
DrawParagraph(dc, paragraph); DrawParagraph(dc, paragraph);
} }
@@ -233,7 +209,5 @@ void wxStaticText::SetLabel(const wxString& st )
SetSize( GetBestSize() ) ; SetSize( GetBestSize() ) ;
Refresh() ; Refresh() ;
MacUpdateImmediately() ; Update() ;
// wxClientDC dc(this);
// OnDraw( dc ) ;
} }

28
src/mac/stattext.cpp
View File

@@ -131,29 +131,6 @@ void wxStaticText::OnDraw( wxDC &dc )
wxString paragraph; wxString paragraph;
int i = 0 ; int i = 0 ;
wxString text = m_label; wxString text = m_label;
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 ;
}
parent = parent->GetParent() ;
}
}
}
while (i < text.Length()) while (i < text.Length())
{ {
paragraph += text[i]; paragraph += text[i];
@@ -163,7 +140,6 @@ void wxStaticText::OnDraw( wxDC &dc )
++i; ++i;
} }
if (paragraph.Length() > 0) if (paragraph.Length() > 0)
DrawParagraph(dc, paragraph); DrawParagraph(dc, paragraph);
} }
@@ -233,7 +209,5 @@ void wxStaticText::SetLabel(const wxString& st )
SetSize( GetBestSize() ) ; SetSize( GetBestSize() ) ;
Refresh() ; Refresh() ;
MacUpdateImmediately() ; Update() ;
// wxClientDC dc(this);
// OnDraw( dc ) ;
} }