Return smaller images for wxART_MENU/BUTTON under OS X.

[wxWidgets.git] / src / osx / carbon / dataview.cpp

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index dbb38514bfd1dad132d9d844c49547b23ecac36c..a08481951fa4d2bcd2b4918d7412188fc7ed035c 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -353,9 +353,9 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee
   callbacks.u.v1.itemDataCallback          = gDataBrowserTableViewItemDataUPP;
   callbacks.u.v1.itemCompareCallback       = gDataBrowserTableViewItemCompareUPP;
   callbacks.u.v1.itemNotificationCallback  = gDataBrowserTableViewItemNotificationUPP;
-       callbacks.u.v1.acceptDragCallback        = gDataBrowserTableViewAcceptDragUPP;
-       callbacks.u.v1.addDragItemCallback       = gDataBrowserTableViewAddDragItemUPP;
-       callbacks.u.v1.receiveDragCallback       = gDataBrowserTableViewReceiveDragUPP;
+  callbacks.u.v1.acceptDragCallback        = gDataBrowserTableViewAcceptDragUPP;
+  callbacks.u.v1.addDragItemCallback       = gDataBrowserTableViewAddDragItemUPP;
+  callbacks.u.v1.receiveDragCallback       = gDataBrowserTableViewReceiveDragUPP;
   this->SetCallbacks(&callbacks);
 
  // setup callbacks for customized items:
@@ -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();