From 9dd48eab61f159f9c3f2506d0506e537892dc4b5 Mon Sep 17 00:00:00 2001 From: Andreas Falkenhahn Date: Sun, 11 Oct 2015 17:07:15 +0200 Subject: [PATCH] Fix wxDataViewCtrl compilation when wxUSE_SPINCTRL==0 Just don't define wxDataViewSpinRenderer in this case. --- include/wx/dvrenderers.h | 4 ++++ src/common/datavcmn.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h index 22933c6cac..5b36bb458f 100644 --- a/include/wx/dvrenderers.h +++ b/include/wx/dvrenderers.h @@ -358,6 +358,8 @@ private: #error "unknown native wxDataViewCtrl implementation" #endif +#if wxUSE_SPINCTRL + // ---------------------------------------------------------------------------- // wxDataViewSpinRenderer // ---------------------------------------------------------------------------- @@ -381,6 +383,8 @@ private: long m_min,m_max; }; +#endif // wxUSE_SPINCTRL + #if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXOSX_CARBON__) // ---------------------------------------------------------------------------- diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index a94c0022e7..770022875e 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -1569,6 +1569,7 @@ wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, wxDataViewEvent ); wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_DROP, wxDataViewEvent ); +#if wxUSE_SPINCTRL // ------------------------------------- // wxDataViewSpinRenderer @@ -1638,6 +1639,8 @@ bool wxDataViewSpinRenderer::GetValue( wxVariant &value ) const return true; } +#endif // wxUSE_SPINCTRL + // ------------------------------------- // wxDataViewChoiceRenderer // -------------------------------------