From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 26 Sep 2009 16:43:44 +0000 (+0000)
Subject: No real changes, just small cleanup in wxMac wxDVC.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0b2a23c48d541be64251ae7e85fd7871408fb8df

No real changes, just small cleanup in wxMac wxDVC.

Use wxDC{Pen,Brush}Changer classes instead of setting/restoring pen and brush
manually.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index b48290c538..a08481951f 100644
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -1683,7 +1683,6 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem
   bool is_active = IsControlActive( this->m_controlRef );
   if (state == kDataBrowserItemIsSelected)
   {
-
       wxColour col( wxMacCreateCGColorFromHITheme( (is_active) ?
                              kThemeBrushAlternatePrimaryHighlightColor
                              : kThemeBrushSecondaryHighlightColor ) );
@@ -1695,14 +1694,9 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem
       rect.x = itemrect.left-2;
       rect.width = itemrect.right-itemrect.left+3;
 
-      wxBrush selBrush( col );
-      wxPen oldpen( dc->GetPen() );
-      wxBrush oldbrush( dc->GetBrush() );
-      dc->SetPen( *wxTRANSPARENT_PEN );
-      dc->SetBrush( selBrush );
+      wxDCPenChanger setPen(*dc, *wxTRANSPARENT_PEN);
+      wxDCBrushChanger setBrush(*dc, col);
       dc->DrawRectangle(rect);
-      dc->SetBrush( oldbrush );
-      dc->SetPen( oldpen );
   }
 
   wxDataViewModel *model = dataViewCtrlPtr->GetModel();