From 607f6d2b4f2e29c389a9bc753813077d0f57d3cb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 19 Dec 2001 21:54:35 +0000 Subject: [PATCH] removed clearing (done anyway) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/stattext.cpp | 68 ++++++++++++------------------------- src/mac/stattext.cpp | 68 ++++++++++++------------------------- 2 files changed, 42 insertions(+), 94 deletions(-) diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index 39a5e39b06..bb9b15ad7f 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -128,44 +128,20 @@ void wxStaticText::OnDraw( wxDC &dc ) if (m_width <= 0 || m_height <= 0) return; - wxString paragraph; - int i = 0 ; - 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()) - { - paragraph += text[i]; - - if (text[i] == 13 || text[i] == 10) - DrawParagraph(dc, paragraph); - - ++i; - } - - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph); + 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); } void wxStaticText::OnPaint( wxPaintEvent &event ) @@ -227,13 +203,11 @@ wxSize wxStaticText::DoGetBestSize() const void wxStaticText::SetLabel(const wxString& st ) { - SetTitle( st ) ; - m_label = st ; - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ) ; - - Refresh() ; - MacUpdateImmediately() ; -// wxClientDC dc(this); -// OnDraw( dc ) ; + SetTitle( st ) ; + m_label = st ; + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + SetSize( GetBestSize() ) ; + + Refresh() ; + Update() ; } diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp index 39a5e39b06..bb9b15ad7f 100644 --- a/src/mac/stattext.cpp +++ b/src/mac/stattext.cpp @@ -128,44 +128,20 @@ void wxStaticText::OnDraw( wxDC &dc ) if (m_width <= 0 || m_height <= 0) return; - wxString paragraph; - int i = 0 ; - 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()) - { - paragraph += text[i]; - - if (text[i] == 13 || text[i] == 10) - DrawParagraph(dc, paragraph); - - ++i; - } - - if (paragraph.Length() > 0) - DrawParagraph(dc, paragraph); + 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); } void wxStaticText::OnPaint( wxPaintEvent &event ) @@ -227,13 +203,11 @@ wxSize wxStaticText::DoGetBestSize() const void wxStaticText::SetLabel(const wxString& st ) { - SetTitle( st ) ; - m_label = st ; - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) - SetSize( GetBestSize() ) ; - - Refresh() ; - MacUpdateImmediately() ; -// wxClientDC dc(this); -// OnDraw( dc ) ; + SetTitle( st ) ; + m_label = st ; + if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + SetSize( GetBestSize() ) ; + + Refresh() ; + Update() ; } -- 2.47.2