Remove a couple duplicate feature checks, and check for defines before setting them to avoid redefinition warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -74,17 +74,16 @@
|
|||||||
#define wxUSE_DATAVIEWCTRL 0
|
#define wxUSE_DATAVIEWCTRL 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_DRAG_AND_DROP
|
#if wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#undef wxUSE_DRAG_AND_DROP
|
#undef wxUSE_DOC_VIEW_ARCHITECTURE
|
||||||
#define wxUSE_DRAG_AND_DROP 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if wxUSE_TASKBARICON
|
|
||||||
#undef wxUSE_TASKBARICON
|
|
||||||
#define wxUSE_TASKBARICON 0
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define wxUSE_DOC_VIEW_ARCHITECTURE 0
|
#define wxUSE_DOC_VIEW_ARCHITECTURE 0
|
||||||
|
|
||||||
|
#if wxUSE_WXHTML_HELP
|
||||||
|
#undef wxUSE_WXHTML_HELP
|
||||||
|
#endif
|
||||||
|
|
||||||
#define wxUSE_WXHTML_HELP 0
|
#define wxUSE_WXHTML_HELP 0
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user