From 6beaeedf581dfd8bf2bf4d5b87c98889b803acd0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@zeitlins.org>
Date: Thu, 24 Mar 2016 16:31:15 +0100
Subject: [PATCH] Correct tests for wxUSE_GENERICDATAVIEWCTRL in wxOSX code

We must include wx/dataview.h, where this symbol is defined, before testing
for it.
---
 src/osx/cocoa/dataview.mm | 10 ++++++++--
 src/osx/dataview_osx.cpp  |  9 +++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index 3bd3efadb7..db4f96d6d1 100644
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -10,7 +10,11 @@
 
 #include "wx/wxprec.h"
 
-#if (wxUSE_DATAVIEWCTRL == 1) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#if !defined(wxUSE_GENERICDATAVIEWCTRL)
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -3290,4 +3294,6 @@ void wxDataViewColumn::SetNativeData(wxDataViewColumnNativeData* newNativeDataPt
     m_NativeDataPtr = newNativeDataPtr;
 }
 
-#endif // (wxUSE_DATAVIEWCTRL == 1) && !defined(wxUSE_GENERICDATAVIEWCTRL)
+#endif // !wxUSE_GENERICDATAVIEWCTRL
+
+#endif // wxUSE_DATAVIEWCTRL
diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 926bf972f7..2cdbc36020 100644
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -9,7 +9,11 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0))
+#if wxUSE_DATAVIEWCTRL
+
+#include "wx/dataview.h"
+
+#ifndef wxUSE_GENERICDATAVIEWCTRL
 
 #include <limits>
 
@@ -728,5 +732,6 @@ wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
   EVT_MOTION(wxDataViewCtrl::OnMouse)
 wxEND_EVENT_TABLE()
 
-#endif // (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0))
+#endif // !wxUSE_GENERICDATAVIEWCTRL
 
+#endif // wxUSE_DATAVIEWCTRL