X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/350df6ae4f90f42a90e4c26ef28c7407a4deb485..4813bb8d72d4e6821e031f2b19baaa338b714d39:/src/mac/carbon/databrow.cpp?ds=inline

diff --git a/src/mac/carbon/databrow.cpp b/src/mac/carbon/databrow.cpp
index e7fe19a2a6..0a70c51159 100644
--- a/src/mac/carbon/databrow.cpp
+++ b/src/mac/carbon/databrow.cpp
@@ -132,6 +132,10 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee
       attributes |= kDataBrowserAttributeListViewDrawColumnDividers;
     else
       attributes &= ~kDataBrowserAttributeListViewDrawColumnDividers;
+      
+    if ((style & wxDV_ROW_LINES) != 0)
+      attributes |= kDataBrowserAttributeListViewAlternatingRowColors;
+      
     (void) this->SetAttributes(attributes);
   } /* if */
 
@@ -566,7 +570,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow
                               columnIndex,sortOrder != kDataBrowserOrderDecreasing) < 0);
 } /* wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */
 
-void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice)
+void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 WXUNUSED(bitDepth), Boolean WXUNUSED(colorDevice))
 {
   DataBrowserTableViewColumnIndex columnIndex;
 
@@ -720,7 +724,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
             if (errorStatus == noErr)
             {
              // variable definitions and initializations:
-              wxMacCFStringHolder modifiedString(stringReference);
+              wxCFStringRef modifiedString(stringReference);
               wxVariant           modifiedData(modifiedString.AsString());
 
               if (dataViewCtrlPtr->GetModel()->SetValue(modifiedData,wxDataViewItem(reinterpret_cast<void*>(itemID)),static_cast<unsigned int>(columnIndex)))