From d8b2da0334d4602f205689146862a834c1c6f5d9 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Sat, 15 Oct 2016 20:52:14 +0200 Subject: [PATCH] Remove wxUSE_VARIANT guards wxDataViewCtrl requires wxVariant so these guards are not necessary. --- include/wx/generic/dataview.h | 2 -- src/generic/datavgen.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index 80d7cba62d..8bf816228d 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -433,9 +433,7 @@ public: virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE; -#if wxUSE_VARIANT virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE; -#endif // wxUSE_VARIANT }; #endif // wxUSE_ACCESSIBILITY diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 2ee7ecc3c1..596fdc64d0 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -6250,7 +6250,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetFocus(int* childId, wxAccessible** chil return wxACC_OK; } -#if wxUSE_VARIANT // Gets a variant representing the selected children // of this object. // Acceptable values: @@ -6290,7 +6289,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetSelections(wxVariant* selections) return wxACC_OK; } -#endif // wxUSE_VARIANT #endif // wxUSE_ACCESSIBILITY