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

Remove wxUSE_VARIANT guards

Browse Source 
wxDataViewCtrl requires wxVariant so these guards are not necessary.
This commit is contained in:
Artur Wieczorek
2016-10-15 20:52:14 +02:00
parent d5880dcfd9
commit d8b2da0334
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/dataview.h
View File

@@ -433,9 +433,7 @@ public:
virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE; virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE;
#if wxUSE_VARIANT
virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE; virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE;
#endif // wxUSE_VARIANT
}; };
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY

2
src/generic/datavgen.cpp
View File

@@ -6250,7 +6250,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetFocus(int* childId, wxAccessible** chil
return wxACC_OK; return wxACC_OK;
} }
#if wxUSE_VARIANT
// Gets a variant representing the selected children // Gets a variant representing the selected children
// of this object. // of this object.
// Acceptable values: // Acceptable values:
@@ -6290,7 +6289,6 @@ wxAccStatus wxDataViewCtrlAccessible::GetSelections(wxVariant* selections)
return wxACC_OK; return wxACC_OK;
} }
#endif // wxUSE_VARIANT
#endif // wxUSE_ACCESSIBILITY #endif // wxUSE_ACCESSIBILITY