X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5cbee178f213c1bae361abca0113646bf323584..28dd9a9d035b5435897d626d1b57b4308daa0371:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 237b479b54..1ea7d95e19 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -121,6 +121,14 @@ # endif #endif /* !defined(wxUSE_DYNAMIC_LOADER) */ +#ifndef wxUSE_INTL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_INTL must be defined." +# else +# define wxUSE_INTL 0 +# endif +#endif /* !defined(wxUSE_INTL) */ + #ifndef wxUSE_LOG # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_LOG must be defined." @@ -291,6 +299,22 @@ # endif #endif /* wxUSE_VARIANT */ +#ifndef wxUSE_WEAKREF +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEAKREF must be defined." +# else +# define wxUSE_WEAKREF 0 +# endif +#endif /* wxUSE_WEAKREF */ + +#ifndef wxUSE_XLOCALE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_XLOCALE must be defined." +# else +# define wxUSE_XLOCALE 0 +# endif +#endif /* !defined(wxUSE_XLOCALE) */ + /* Section 1b: all these tests are for GUI only. @@ -335,6 +359,14 @@ # endif #endif /* !defined(wxUSE_ANIMATIONCTRL) */ +#ifndef wxUSE_AUTOID_MANAGEMENT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_AUTOID_MANAGEMENT must be defined." +# else +# define wxUSE_AUTOID_MANAGEMENT 0 +# endif +#endif /* !defined(wxUSE_AUTOID_MANAGEMENT) */ + #ifndef wxUSE_BITMAPCOMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_BITMAPCOMBOBOX must be defined." @@ -741,6 +773,14 @@ # endif #endif /* !defined(wxUSE_NOTEBOOK) */ +#ifndef wxUSE_NOTIFICATION_MESSAGE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_NOTIFICATION_MESSAGE must be defined." +# else +# define wxUSE_NOTIFICATION_MESSAGE 0 +# endif +#endif /* !defined(wxUSE_NOTIFICATION_MESSAGE) */ + #ifndef wxUSE_ODCOMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_ODCOMBOBOX must be defined." @@ -1004,7 +1044,11 @@ # include "wx/x11/chkconf.h" #endif -#ifdef __UNIX__ +/* + __UNIX__ is also defined under Cygwin but we shouldn't perform these checks + there if we're building wxMSW. + */ +#if defined(__UNIX__) && !defined(__WXMSW__) # include "wx/unix/chkconf.h" #endif