# 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_IPV6
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_IPV6 must be defined."
+# else
+# define wxUSE_IPV6 0
+# endif
+#endif /* !defined(wxUSE_IPV6) */
+
#ifndef wxUSE_LOG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LOG must be defined."
# endif
#endif /* wxUSE_VARIANT */
+#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.
# 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."
# endif
#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
+#ifndef wxUSE_FILECTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FILECTRL must be defined."
+# else
+# define wxUSE_FILECTRL 0
+# endif
+#endif /* !defined(wxUSE_FILECTRL) */
+
#ifndef wxUSE_FILEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FILEDLG must be defined."
#endif /* !defined(wxUSE_HTML) */
#ifndef wxUSE_LIBMSPACK
-# ifndef __UNIX__
+# if !defined(__UNIX__) || defined(__WXPALMOS__)
/* set to 0 on platforms that don't have libmspack */
# define wxUSE_LIBMSPACK 0
# else
# 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."
# include "wx/msw/chkconf.h"
#elif defined(__WXGTK__)
# include "wx/gtk/chkconf.h"
+#elif defined(__WXCOCOA__)
+# include "wx/cocoa/chkconf.h"
#elif defined(__WXMAC__)
-# include "wx/mac/chkconf.h"
+# include "wx/osx/chkconf.h"
#elif defined(__OS2__)
# include "wx/os2/chkconf.h"
#elif defined(__WXMGL__)
# 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
# endif
#endif /* wxUSE_MIMETYPE */
-#if wxUSE_ODBC
-# if !wxUSE_DATETIME
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxODBC requires wxUSE_DATETIME"
-# else
-# undef wxUSE_ODBC
-# define wxUSE_ODBC 0
-# endif
-# endif
-#endif /* wxUSE_ODBC */
-
#if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
# endif
#endif /* !wxMSW || wxUniv */
+/* generic file dialog depends on (generic) file control */
+#if wxUSE_FILEDLG && !wxUSE_FILECTRL && \
+ (defined(__WXUNIVERSAL__) || defined(__WXGTK__))
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "Generic wxFileDialog requires wxFileCtrl"
+# else
+# undef wxUSE_FILECTRL
+# define wxUSE_FILECTRL 1
+# endif
+#endif /* wxUSE_FILEDLG */
+
/* common dependencies */
#if wxUSE_CALENDARCTRL
# if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)
# endif
#endif /* wxUSE_SVG */
+#if wxUSE_SVG && !wxUSE_IMAGE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_SVG requires wxUSE_IMAGE"
+# else
+# undef wxUSE_SVG
+# define wxUSE_SVG 0
+# endif
+#endif /* wxUSE_SVG */
+
+#if wxUSE_SVG && !wxUSE_LIBPNG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_SVG requires wxUSE_LIBPNG"
+# else
+# undef wxUSE_SVG
+# define wxUSE_SVG 0
+# endif
+#endif /* wxUSE_SVG */
+
#if !wxUSE_VARIANT
# if wxUSE_DATAVIEWCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# define wxUSE_DATAVIEWCTRL 0
# endif
# endif
-
-# if wxUSE_ODBC
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_ODBC requires wxVariant"
-# else
-# undef wxUSE_ODBC
-# define wxUSE_ODBC 0
-# endif
-# endif
#endif /* wxUSE_VARIANT */
#endif /* wxUSE_GUI */