Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct tests for wxUSE_GENERICDATAVIEWCTRL in wxOSX code

Browse Source 
We must include wx/dataview.h, where this symbol is defined, before testing
for it.
This commit is contained in:
Vadim Zeitlin
2016-03-24 16:31:15 +01:00
parent b7e0625b90
commit 6beaeedf58
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/cocoa/dataview.mm
View File

@@ -10,7 +10,11 @@
#include "wx/wxprec.h" #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 #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
@@ -3290,4 +3294,6 @@ void wxDataViewColumn::SetNativeData(wxDataViewColumnNativeData* newNativeDataPt
m_NativeDataPtr = newNativeDataPtr; m_NativeDataPtr = newNativeDataPtr;
} }
#endif // (wxUSE_DATAVIEWCTRL == 1) && !defined(wxUSE_GENERICDATAVIEWCTRL) #endif // !wxUSE_GENERICDATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL

9
src/osx/dataview_osx.cpp
View File

@@ -9,7 +9,11 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.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> #include <limits>
@@ -728,5 +732,6 @@ wxBEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
EVT_MOTION(wxDataViewCtrl::OnMouse) EVT_MOTION(wxDataViewCtrl::OnMouse)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
#endif // (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0)) #endif // !wxUSE_GENERICDATAVIEWCTRL
#endif // wxUSE_DATAVIEWCTRL