From 18fc421b1fa9a64f782f27ad0cc1ceb0b958c706 Mon Sep 17 00:00:00 2001 From: Kevin Ollivier Date: Sun, 7 Sep 2008 23:35:39 +0000 Subject: [PATCH] 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 --- include/wx/osx/cocoa/chkconf.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 0dc2e991fc..c4b80425e7 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -74,17 +74,16 @@ #define wxUSE_DATAVIEWCTRL 0 #endif -#if wxUSE_DRAG_AND_DROP -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 +#if wxUSE_DOC_VIEW_ARCHITECTURE +#undef wxUSE_DOC_VIEW_ARCHITECTURE #endif -#if wxUSE_TASKBARICON -#undef wxUSE_TASKBARICON -#define wxUSE_TASKBARICON 0 +#define wxUSE_DOC_VIEW_ARCHITECTURE 0 + +#if wxUSE_WXHTML_HELP +#undef wxUSE_WXHTML_HELP #endif -#define wxUSE_DOC_VIEW_ARCHITECTURE 0 #define wxUSE_WXHTML_HELP 0 #endif -- 2.45.2