-/*
- * Name: wx/chkconf.h
- * Purpose: check the config settings for consistency
- * Author: Vadim Zeitlin
- * Modified by:
- * Created: 09.08.00
- * RCS-ID: $Id$
- * Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
- * Licence: wxWindows licence
- */
+/**
+* Name: wx/chkconf.h
+* Purpose: check the config settings for consistency
+* Author: Vadim Zeitlin
+* Modified by:
+* Created: 09.08.00
+* RCS-ID: $Id$
+* Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
+* Licence: wxWindows licence
+*/
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
Compiler-specific checking.
*/
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+# include "wx/palmos/chkconf.h"
+#elif defined(__WXWINCE__)
+# include "wx/msw/wince/chkconf.h"
+#elif defined(__WXMSW__)
# include "wx/msw/chkconf.h"
#elif defined(__WXMAC__)
# include "wx/mac/chkconf.h"
# define wxUSE_GUI 1
#endif /* !defined(wxUSE_GUI) */
-/* wxBase doesn't need compatibility settings as it's a new port */
-#if !wxUSE_GUI
-# undef WXWIN_COMPATIBILITY
-# undef WXWIN_COMPATIBILITY_2
-# undef WXWIN_COMPATIBILITY_2_2
-# define WXWIN_COMPATIBILITY 0
-# define WXWIN_COMPATIBILITY_2 0
-# define WXWIN_COMPATIBILITY_2_2 0
-#endif /* !wxUSE_GUI */
+/*
+ If we're compiling without support for threads/exceptions we have to
+ disable the corresponding features.
+ */
+#ifdef wxNO_THREADS
+# undef wxUSE_THREADS
+# define wxUSE_THREADS 0
+#endif /* wxNO_THREADS */
+
+#ifdef wxNO_EXCEPTIONS
+# undef wxUSE_EXCEPTIONS
+# define wxUSE_EXCEPTIONS 0
+#endif /* wxNO_EXCEPTIONS */
+
+/* we also must disable exceptions if compiler doesn't support them */
+#if defined(_MSC_VER) && !defined(_CPPUNWIND)
+# undef wxUSE_EXCEPTIONS
+# define wxUSE_EXCEPTIONS 0
+#endif /* VC++ without exceptions support */
+
/*
tests for non GUI features
# endif
#endif /* !defined(wxUSE_DYNLIB_CLASS) */
+#ifndef wxUSE_EXCEPTIONS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_EXCEPTIONS must be defined."
+# else
+# define wxUSE_EXCEPTIONS 0
+# endif
+#endif /* !defined(wxUSE_EXCEPTIONS) */
+
#ifndef wxUSE_FILESYSTEM
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FILESYSTEM must be defined."
# endif
#endif /* !defined(wxUSE_REGEX) */
+#ifndef wxUSE_STDPATHS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_STDPATHS must be defined."
+# else
+# define wxUSE_STDPATHS 1
+# endif
+#endif /* !defined(wxUSE_STDPATHS) */
+
+#ifndef wxUSE_XML
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_XML must be defined."
+# else
+# define wxUSE_XML 0
+# endif
+#endif /* !defined(wxUSE_XML) */
+
#ifndef wxUSE_SOCKETS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SOCKETS must be defined."
# endif
#endif /* !defined(wxUSE_CHOICE) */
+#ifndef wxUSE_CHOICEBOOK
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_CHOICEBOOK must be defined."
+# else
+# define wxUSE_CHOICEBOOK 0
+# endif
+#endif /* !defined(wxUSE_CHOICEBOOK) */
+
#ifndef wxUSE_CHOICEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CHOICEDLG must be defined."
# endif
#endif /* !defined(wxUSE_DATAOBJ) */
+#ifndef wxUSE_DATEPICKCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DATEPICKCTRL must be defined."
+# else
+# define wxUSE_DATEPICKCTRL 0
+# endif
+#endif /* !defined(wxUSE_DATEPICKCTRL) */
+
+#ifndef wxUSE_DISPLAY
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DISPLAY must be defined."
+# else
+# define wxUSE_DISPLAY 0
+# endif
+#endif /* !defined(wxUSE_DISPLAY) */
+
#ifndef wxUSE_DOC_VIEW_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
# 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 */
+# define wxUSE_LIBMSPACK 0
+# else
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_LIBMSPACK must be defined."
+# else
+# define wxUSE_LIBMSPACK 0
+# endif
+# endif
+#endif /* !defined(wxUSE_LIBMSPACK) */
+
#ifndef wxUSE_ICO_CUR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ICO_CUR must be defined."
# endif
#endif /* !defined(wxUSE_JOYSTICK) */
+#ifndef wxUSE_LISTBOOK
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_LISTBOOK must be defined."
+# else
+# define wxUSE_LISTBOOK 0
+# endif
+#endif /* !defined(wxUSE_LISTBOOK) */
+
#ifndef wxUSE_LISTBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LISTBOX must be defined."
# endif
#endif /* !defined(wxUSE_LOG_DIALOG) */
+#ifndef wxUSE_MDI
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_MDI must be defined."
+# else
+# define wxUSE_MDI 0
+# endif
+#endif /* !defined(wxUSE_MDI) */
+
#ifndef wxUSE_MDI_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MDI_ARCHITECTURE must be defined."
# endif
#endif /* !defined(wxUSE_SLIDER) */
+#ifndef wxUSE_SOUND
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_SOUND must be defined."
+# else
+# define wxUSE_SOUND 0
+# endif
+#endif /* !defined(wxUSE_SOUND) */
+
#ifndef wxUSE_SPINBTN
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_SPINBTN must be defined."
# endif
#endif /* !defined(wxUSE_TREECTRL) */
-#ifndef wxUSE_DISPLAY
+#ifndef wxUSE_VALIDATORS
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_DISPLAY must be defined."
+# error "wxUSE_VALIDATORS must be defined."
# else
-# define wxUSE_DISPLAY 0
+# define wxUSE_VALIDATORS 0
# endif
-#endif /* !defined(wxUSE_TREECTRL) */
+#endif /* !defined(wxUSE_VALIDATORS) */
#ifndef wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# endif
#endif /* wxUSE_UNICODE_MSLU */
-#if wxUSE_ODBC && wxUSE_UNICODE
+/* ODBC and Unicode are now compatible */
+
+#if 0 /* wxUSE_ODBC && wxUSE_UNICODE */
# ifdef wxABORT_ON_CONFIG_ERROR
/* (ODBC classes aren't Unicode-compatible yet) */
# error "wxUSE_ODBC can't be used with wxUSE_UNICODE"
# endif
#endif /* wxUSE_ODBC */
+#if wxUSE_XML && !wxUSE_WCHAR_T
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_XML requires wxUSE_WCHAR_T"
+# else
+# undef wxUSE_XML
+# define wxUSE_XML 0
+# endif
+#endif /* wxUSE_UNICODE_MSLU */
+
+#if !wxUSE_DYNLIB_CLASS
+# if wxUSE_DYNAMIC_LOADER
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DYNAMIC_LOADER requires wxUSE_DYNLIB_CLASS."
+# else
+# define wxUSE_DYNLIB_CLASS 1
+# endif
+# endif
+#endif /* wxUSE_DYNLIB_CLASS */
+
+#if wxUSE_ZIPSTREAM
+# if !wxUSE_ZLIB
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxZip requires wxZlib"
+# else
+# undef wxUSE_ZLIB
+# define wxUSE_ZLIB 1
+# endif
+# endif
+# if !wxUSE_ARCHIVE_STREAMS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxZip requires wxArchive"
+# else
+# undef wxUSE_ARCHIVE_STREAMS
+# define wxUSE_ARCHIVE_STREAMS 1
+# endif
+# endif
+#endif /* wxUSE_ZIPSTREAM */
+
/* the rest of the tests is for the GUI settings only */
#if wxUSE_GUI
# endif
#endif /* controls */
+#if wxUSE_BMPBUTTON
+# if !wxUSE_BUTTON
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_BMPBUTTON requires wxUSE_BUTTON"
+# else
+# undef wxUSE_BUTTON
+# define wxUSE_BUTTON 1
+# endif
+# endif
+#endif /* wxUSE_BMPBUTTON */
+
+#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
+# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_BOOKCTRL must be set."
+# else
+# undef wxUSE_BOOKCTRL
+# endif
+# endif
+
+# ifndef wxUSE_BOOKCTRL
+# define wxUSE_BOOKCTRL 1
+# endif
+#endif /* wxUSE_NOTEBOOK */
+
+#if wxUSE_LISTBOOK
+# if !wxUSE_LISTCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxListbook requires wxListCtrl"
+# else
+# undef wxUSE_LISTCTRL
+# define wxUSE_LISTCTRL 1
+# endif
+# endif
+#endif /* wxUSE_LISTBOOK */
+
+#if wxUSE_CHOICEBOOK
+# if !wxUSE_CHOICE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxChoicebook requires wxChoice"
+# else
+# undef wxUSE_CHOICE
+# define wxUSE_CHOICE 1
+# endif
+# endif
+#endif /* wxUSE_CHOICEBOOK */
+
+/* don't attempt to use native status bar on the platforms not having it */
+#ifndef wxUSE_NATIVE_STATUSBAR
+# define wxUSE_NATIVE_STATUSBAR 0
+#elif wxUSE_NATIVE_STATUSBAR
+# if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \
+ defined(__WXMAC__) || \
+ defined(__WXPALMOS__) )
+# undef wxUSE_NATIVE_STATUSBAR
+# define wxUSE_NATIVE_STATUSBAR 0
+# endif
+#endif
+
/* wxUniv-specific dependencies */
#if defined(__WXUNIVERSAL__)
# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
# define wxUSE_UNICODE_MSLU 0
# endif
# endif /* wxUSE_UNICODE_MSLU */
+# ifndef wxUSE_UXTHEME
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_UXTHEME must be defined."
+# else
+# define wxUSE_UXTHEME 0
+# endif
+# endif /* wxUSE_UXTHEME */
+# ifndef wxUSE_UXTHEME_AUTO
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_UXTHEME_AUTO must be defined."
+# else
+# define wxUSE_UXTHEME_AUTO 0
+# endif
+# endif /* wxUSE_UXTHEME_AUTO */
# ifndef wxUSE_MS_HTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MS_HTML_HELP must be defined."
# endif
# endif
# endif /* wxUSE_DYNAMIC_LOADER */
+
#endif /* wxMSW */
/* wxMAC-specific dependencies */
# endif
#endif /* wxMGL */
-// Hopefully we can emulate these dialogs in due course
-#if wxUSE_SMARTPHONE
+/* Hopefully we can emulate these dialogs in due course */
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
# ifdef wxUSE_COLOURDLG
# undef wxUSE_COLOURDLG
# define wxUSE_COLOURDLG 0
# endif
-#endif /* wxUSE_SMARTPHONE */
+#endif /* __SMARTPHONE__ && __WXWINCE__ */
/* generic controls dependencies */
# endif
#endif /* wxUSE_CALENDARCTRL */
+#if wxUSE_DATEPICKCTRL
+# if !wxUSE_DATETIME
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxDatePickerCtrl requires wxUSE_DATETIME"
+# else
+# undef wxUSE_DATETIME
+# define wxUSE_DATETIME 1
+# endif
+# endif
+#endif /* wxUSE_DATEPICKCTRL */
+
#if wxUSE_CHECKLISTBOX
# if !wxUSE_LISTBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# define wxUSE_LISTBOX 1
# endif
# endif
-#endif /* wxUSE_RADIOBTN */
+#endif /* wxUSE_CHECKLISTBOX */
+
+#if wxUSE_CHOICEDLG
+# if !wxUSE_LISTBOX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "Choice dialogs requires wxListBox"
+# else
+# undef wxUSE_LISTBOX
+# define wxUSE_LISTBOX 1
+# endif
+# endif
+#endif /* wxUSE_CHOICEDLG */
+
+#if wxUSE_HELP
+# if !wxUSE_BMPBUTTON
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_HELP requires wxUSE_BMPBUTTON"
+# else
+# undef wxUSE_BMPBUTTON
+# define wxUSE_BMPBUTTON 1
+# endif
+# endif
+
+# if !wxUSE_CHOICEDLG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_HELP requires wxUSE_CHOICEDLG"
+# else
+# undef wxUSE_CHOICEDLG
+# define wxUSE_CHOICEDLG 1
+# endif
+# endif
+#endif /* wxUSE_HELP */
#if wxUSE_WXHTML_HELP
-# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK
+# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "Built in help controller can't be compiled"
# else
# define wxUSE_COMBOBOX 1
# undef wxUSE_NOTEBOOK
# define wxUSE_NOTEBOOK 1
+# undef wxUSE_SPINCTRL
+# define wxUSE_SPINCTRL 1
# endif
# endif
#endif /* wxUSE_WXHTML_HELP */
+#if !wxUSE_IMAGE
+/*
+ The default wxUSE_IMAGE setting is 1, so if it's set to 0 we assume the
+ user explicitly wants this and disable all other features that require
+ wxUSE_IMAGE.
+ */
+# if wxUSE_DRAGIMAGE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DRAGIMAGE requires wxUSE_IMAGE"
+# else
+# undef wxUSE_DRAGIMAGE
+# define wxUSE_DRAGIMAGE 0
+# endif
+# endif
+
+# if wxUSE_LIBPNG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_LIBPNG requires wxUSE_IMAGE"
+# else
+# undef wxUSE_LIBPNG
+# define wxUSE_LIBPNG 0
+# endif
+# endif
+
+# if wxUSE_LIBJPEG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_LIBJPEG requires wxUSE_IMAGE"
+# else
+# undef wxUSE_LIBJPEG
+# define wxUSE_LIBJPEG 0
+# endif
+# endif
+
+# if wxUSE_LIBTIFF
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_LIBTIFF requires wxUSE_IMAGE"
+# else
+# undef wxUSE_LIBTIFF
+# define wxUSE_LIBTIFF 0
+# endif
+# endif
+
+# if wxUSE_GIF
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_GIF requires wxUSE_IMAGE"
+# else
+# undef wxUSE_GIF
+# define wxUSE_GIF 0
+# endif
+# endif
+
+# if wxUSE_PNM
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_PNM requires wxUSE_IMAGE"
+# else
+# undef wxUSE_PNM
+# define wxUSE_PNM 0
+# endif
+# endif
+
+# if wxUSE_PCX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_PCX requires wxUSE_IMAGE"
+# else
+# undef wxUSE_PCX
+# define wxUSE_PCX 0
+# endif
+# endif
+
+# if wxUSE_IFF
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_IFF requires wxUSE_IMAGE"
+# else
+# undef wxUSE_IFF
+# define wxUSE_IFF 0
+# endif
+# endif
+
+# if wxUSE_TOOLBAR
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_TOOLBAR requires wxUSE_IMAGE"
+# else
+# undef wxUSE_TOOLBAR
+# define wxUSE_TOOLBAR 0
+# endif
+# endif
+
+# if wxUSE_XPM
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_XPM requires wxUSE_IMAGE"
+# else
+# undef wxUSE_XPM
+# define wxUSE_XPM 0
+# endif
+# endif
+
+#endif /* !wxUSE_IMAGE */
+
#if wxUSE_DOC_VIEW_ARCHITECTURE
# if !wxUSE_MENUS
# ifdef wxABORT_ON_CONFIG_ERROR
# endif
# endif
+# if !wxUSE_CHOICEDLG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "DocView requires wxUSE_CHOICEDLG"
+# else
+# undef wxUSE_CHOICEDLG
+# define wxUSE_CHOICEDLG 1
+# endif
+# endif
+
# if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
# ifdef wxABORT_ON_CONFIG_ERROR
# error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"
# define wxUSE_COMBOBOX 1
# endif
# endif
-
-# if !wxUSE_DOC_VIEW_ARCHITECTURE
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE"
-# else
-# undef wxUSE_DOC_VIEW_ARCHITECTURE
-# define wxUSE_DOC_VIEW_ARCHITECTURE 1
-# endif
-# endif
#endif /* wxUSE_PRINTING_ARCHITECTURE */
#if wxUSE_MDI_ARCHITECTURE
+# if !wxUSE_MDI
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "MDI requires wxUSE_MDI"
+# else
+# undef wxUSE_MDI
+# define wxUSE_MDI 1
+# endif
+# endif
+
# if !wxUSE_DOC_VIEW_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
# endif
#endif /* wxUSE_FILEDLG */
+#if !wxUSE_GAUGE || !wxUSE_BUTTON
+# if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__)
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON"
+# else
+# undef wxUSE_GAUGE
+# undef wxUSE_BUTTON
+# define wxUSE_GAUGE 1
+# define wxUSE_BUTTON 1
+# endif
+# endif
+#endif /* !wxUSE_GAUGE */
+
+#if !wxUSE_BUTTON
+# if wxUSE_FONTDLG || \
+ wxUSE_FILEDLG || \
+ wxUSE_CHOICEDLG || \
+ wxUSE_NUMBERDLG || \
+ wxUSE_TEXTDLG || \
+ wxUSE_DIRDLG || \
+ wxUSE_STARTUP_TIPS || \
+ wxUSE_WIZARDDLG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "Common and generic dialogs require wxUSE_BUTTON"
+# else
+# undef wxUSE_BUTTON
+# define wxUSE_BUTTON 1
+# endif
+# endif
+#endif /* !wxUSE_BUTTON */
+
#if !wxUSE_TOOLBAR
# if wxUSE_TOOLBAR_NATIVE
# ifdef wxABORT_ON_CONFIG_ERROR
#endif
#if wxUSE_RADIOBOX
-# if !wxUSE_RADIOBTN || !wxUSE_STATBOX
+# if !wxUSE_RADIOBTN
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_RADIOBOX requires wxUSE_RADIOBTN and wxUSE_STATBOX"
+# error "wxUSE_RADIOBOX requires wxUSE_RADIOBTN"
# else
# undef wxUSE_RADIOBTN
-# undef wxUSE_STATBOX
# define wxUSE_RADIOBTN 1
+# endif
+# endif
+# if !wxUSE_STATBOX && !defined(__WXPALMOS__)
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_RADIOBOX requires wxUSE_STATBOX"
+# else
+# undef wxUSE_STATBOX
# define wxUSE_STATBOX 1
# endif
# endif
#endif /* wxUSE_LOGWINDOW */
#if wxUSE_LOG_DIALOG
-# if !wxUSE_LISTCTRL
+# if !wxUSE_LISTCTRL || !wxUSE_BUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL"
+# error "wxUSE_LOG_DIALOG requires wxUSE_LISTCTRL and wxUSE_BUTTON"
# else
# undef wxUSE_LISTCTRL
# define wxUSE_LISTCTRL 1
+# undef wxUSE_BUTTON
+# define wxUSE_BUTTON 1
# endif
# endif
#endif /* wxUSE_LOG_DIALOG */
-/* I wonder if we shouldn't just remove all occurrences of
- wxUSE_DYNAMIC_CLASSES from the sources? */
-#if !defined(wxUSE_DYNAMIC_CLASSES) || !wxUSE_DYNAMIC_CLASSES
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
-# else
-# undef wxUSE_DYNAMIC_CLASSES
-# define wxUSE_DYNAMIC_CLASSES 1
-# endif
-#endif /* wxUSE_DYNAMIC_CLASSES */
-
#if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxClipboard requires wxDataObject"
# endif
#endif /* wxUSE_WX_RESOURCES */
+#if wxUSE_XRC && !wxUSE_XML
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_XRC requires wxUSE_XML"
+# else
+# undef wxUSE_XRC
+# define wxUSE_XRC 0
+# endif
+#endif /* wxUSE_XRC */
+
+#if wxUSE_SOCKETS && !wxUSE_STOPWATCH
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_SOCKETS requires wxUSE_STOPWATCH"
+# else
+# undef wxUSE_SOCKETS
+# define wxUSE_SOCKETS 0
+# endif
+#endif /* wxUSE_SOCKETS */
+
#endif /* wxUSE_GUI */
projects / wxWidgets.git / blobdiff