From e16514bf08d65e85cc5886108a7b038c7bddd952 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 10 May 2006 13:00:33 +0000 Subject: [PATCH 1/1] test that wxUSE_DATAVIEWCTRL is defined git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 2efc1eea21..857c8a9f8b 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -71,6 +71,8 @@ /* tests for non GUI features + + please keep the options in alphabetical order! */ #ifndef wxUSE_CRASHREPORT @@ -276,6 +278,8 @@ /* all these tests are for GUI only + + please keep the options in alphabetical order! */ #if wxUSE_GUI @@ -394,7 +398,7 @@ # else # define wxUSE_COMBOCONTROL 0 # endif -#endif /* !defined(wxUSE_COMBOBOX) */ +#endif /* !defined(wxUSE_COMBOCONTROL) */ #ifndef wxUSE_DATAOBJ # ifdef wxABORT_ON_CONFIG_ERROR @@ -404,6 +408,14 @@ # endif #endif /* !defined(wxUSE_DATAOBJ) */ +#ifndef wxUSE_DATAVIEWCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DATAVIEWCTRL must be defined." +# else +# define wxUSE_DATAVIEWCTRL 0 +# endif +#endif /* !defined(wxUSE_DATAVIEWCTRL) */ + #ifndef wxUSE_DATEPICKCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_DATEPICKCTRL must be defined." @@ -484,14 +496,6 @@ # endif #endif /* !defined(wxUSE_HTML) */ -#ifndef wxUSE_XRC -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XRC must be defined." -# else -# define wxUSE_XRC 0 -# endif -#endif /* !defined(wxUSE_XRC) */ - #ifndef wxUSE_LIBMSPACK # ifndef __UNIX__ /* set to 0 on platforms that don't have libmspack */ @@ -631,7 +635,7 @@ # else # define wxUSE_OWNERDRAWNCOMBOBOX 0 # endif -#endif /* !defined(wxUSE_COMBOBOX) */ +#endif /* !defined(wxUSE_OWNERDRAWNCOMBOBOX) */ #ifndef wxUSE_PALETTE # ifdef wxABORT_ON_CONFIG_ERROR @@ -841,6 +845,14 @@ # endif #endif /* !defined(wxUSE_WXHTML_HELP) */ +#ifndef wxUSE_XRC +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_XRC must be defined." +# else +# define wxUSE_XRC 0 +# endif +#endif /* !defined(wxUSE_XRC) */ + #endif /* wxUSE_GUI */ /* -- 2.45.2