cleanup mac

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

diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp
index 1547f1e02b4e477f22a721d82d8c980c3ba1df4d..d3500bd746a2a25e4ec0b91fc32f28a8b403ec7e 100644 (file)
--- a/src/mac/carbon/dataview.cpp
+++ b/src/mac/carbon/dataview.cpp
@@ -415,7 +415,7 @@ void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr)
 
 WXDataBrowserPropertyType wxDataViewCustomRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserCustomType);
+    return kDataBrowserCustomType;
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
@@ -444,7 +444,7 @@ bool wxDataViewTextRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewTextRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserTextType);
+    return kDataBrowserTextType;
 }
 
 IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
@@ -476,7 +476,7 @@ bool wxDataViewBitmapRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewBitmapRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserIconType);
+    return kDataBrowserIconType;
 }
 
 IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
@@ -511,7 +511,7 @@ bool wxDataViewIconTextRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewIconTextRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserIconAndTextType);
+    return kDataBrowserIconAndTextType;
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
@@ -536,7 +536,7 @@ bool wxDataViewToggleRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewToggleRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserCheckboxType);
+    return kDataBrowserCheckboxType;
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
@@ -562,7 +562,7 @@ bool wxDataViewProgressRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewProgressRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserProgressBarType);
+    return kDataBrowserProgressBarType;
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
@@ -586,7 +586,7 @@ bool wxDataViewDateRenderer::Render(void)
 
 WXDataBrowserPropertyType wxDataViewDateRenderer::GetPropertyType() const
 {
-    return WXDataBrowserPropertyType(kDataBrowserDateTimeType);
+    return kDataBrowserDateTimeType;
 }
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
@@ -907,12 +907,12 @@ bool wxDataViewCtrl::AppendColumn(wxDataViewColumn* dataViewColumnPtr)
 #endif
     if (dataViewColumnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_EDITABLE)
       columnDescription.propertyDesc.propertyFlags |= kDataBrowserPropertyIsEditable;
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+
     if ((columnDescription.propertyDesc.propertyType == kDataBrowserTextType) ||
         (columnDescription.propertyDesc.propertyType == kDataBrowserIconAndTextType) ||
         (columnDescription.propertyDesc.propertyType == kDataBrowserDateTimeType))
       columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
-#endif
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
     columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;
 #endif