From 489d2dd393dfb65f3729b8b4eca1b9fa4a4b7d57 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 4 Jan 2006 10:34:34 +0000 Subject: [PATCH] factoring out Background setter git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/dcclient.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp index f16d43979d..7f14f9b53a 100644 --- a/src/mac/carbon/dcclient.cpp +++ b/src/mac/carbon/dcclient.cpp @@ -130,7 +130,6 @@ wxWindowDC::wxWindowDC(wxWindow *window) m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); } else { @@ -142,7 +141,6 @@ wxWindowDC::wxWindowDC(wxWindow *window) m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ; m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; - SetBackground(MacGetBackgroundBrush(window)); } // there is no out-of-order drawing on OSX #else @@ -151,8 +149,8 @@ wxWindowDC::wxWindowDC(wxWindow *window) CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - SetBackground(MacGetBackgroundBrush(window)); #endif + SetBackground(MacGetBackgroundBrush(window)); SetFont( window->GetFont() ) ; } @@ -203,7 +201,6 @@ wxClientDC::wxClientDC(wxWindow *window) m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetBrush( m_brush ) ; SetClippingRegion( 0 , 0 , size.x , size.y ) ; - SetBackground(MacGetBackgroundBrush(window)); } else {