-/**
-* 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
-*/
+/*
+ * 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.
+ Platform-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"
+#elif defined(__OS2__)
+# include "wx/os2/chkconf.h"
+#elif defined(__WXMGL__)
+# include "wx/mgl/chkconf.h"
+#elif defined(__WXMOTIF__)
+# include "wx/motif/chkconf.h"
#endif
/*
this global setting determines what should we do if the setting FOO
- requires BAR and BAR is not set: we can either silently define BAR
- (default, recommended) or give an error and abort (mainly useful for
- developers only)
+ requires BAR and BAR is not set: we can either silently unset FOO as well
+ (do this if you're trying to build the smallest possible library) or give an
+ error and abort (default as leads to least surprizing behaviour)
*/
#define wxABORT_ON_CONFIG_ERROR
# define wxUSE_GUI 1
#endif /* !defined(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
+
+ please keep the options in alphabetical order!
*/
+#ifndef wxUSE_CRASHREPORT
+ /* this one is special: as currently it is Windows-only, don't force it
+ to be defined on other platforms */
+# if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__)
+# error "wxUSE_CRASHREPORT must be defined."
+# else
+# define wxUSE_CRASHREPORT 0
+# endif
+#endif /* !defined(wxUSE_CRASHREPORT) */
+
#ifndef wxUSE_DYNLIB_CLASS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DYNLIB_CLASS must be defined."
# endif
#endif /* !defined(wxUSE_MIMETYPE) */
+#ifndef wxUSE_ON_FATAL_EXCEPTION
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_ON_FATAL_EXCEPTION must be defined."
+# else
+# define wxUSE_ON_FATAL_EXCEPTION 0
+# endif
+#endif /* !defined(wxUSE_ON_FATAL_EXCEPTION) */
+
+#ifndef wxUSE_PRINTF_POS_PARAMS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_PRINTF_POS_PARAMS must be defined."
+# else
+# define wxUSE_PRINTF_POS_PARAMS 0
+# endif
+#endif /* !defined(wxUSE_PRINTF_POS_PARAMS) */
+
#ifndef wxUSE_PROTOCOL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PROTOCOL 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."
/*
all these tests are for GUI only
+
+ please keep the options in alphabetical order!
*/
#if wxUSE_GUI
# 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_COLOURDLG) */
+#ifndef wxUSE_COLOURPICKERCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COLOURPICKERCTRL must be defined."
+# else
+# define wxUSE_COLOURPICKERCTRL 0
+# endif
+#endif /* !defined(wxUSE_COLOURPICKERCTRL) */
+
#ifndef wxUSE_COMBOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_COMBOBOX must be defined."
# endif
#endif /* !defined(wxUSE_COMBOBOX) */
+#ifndef wxUSE_COMBOCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COMBOCTRL must be defined."
+# else
+# define wxUSE_COMBOCTRL 0
+# endif
+#endif /* !defined(wxUSE_COMBOCTRL) */
+
#ifndef wxUSE_DATAOBJ
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DATAOBJ must be defined."
# 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."
+# else
+# define wxUSE_DATEPICKCTRL 0
+# endif
+#endif /* !defined(wxUSE_DATEPICKCTRL) */
+
+#ifndef wxUSE_DIRPICKERCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_DIRPICKERCTRL must be defined."
+# else
+# define wxUSE_DIRPICKERCTRL 0
+# endif
+#endif /* !defined(wxUSE_DIRPICKERCTRL) */
+
#ifndef wxUSE_DISPLAY
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DISPLAY must be defined."
# endif
#endif /* !defined(wxUSE_FILEDLG) */
+#ifndef wxUSE_FILEPICKERCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FILEPICKERCTRL must be defined."
+# else
+# define wxUSE_FILEPICKERCTRL 0
+# endif
+#endif /* !defined(wxUSE_FILEPICKERCTRL) */
+
#ifndef wxUSE_FONTDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FONTDLG must be defined."
# endif
#endif /* !defined(wxUSE_FONTMAP) */
+#ifndef wxUSE_FONTPICKERCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FONTPICKERCTRL must be defined."
+# else
+# define wxUSE_FONTPICKERCTRL 0
+# endif
+#endif /* !defined(wxUSE_FONTPICKERCTRL) */
+
#ifndef wxUSE_GAUGE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_GAUGE must be defined."
# endif
#endif /* !defined(wxUSE_HELP) */
+#ifndef wxUSE_HYPERLINKCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_HYPERLINKCTRL must be defined."
+# else
+# define wxUSE_HYPERLINKCTRL 0
+# endif
+#endif /* !defined(wxUSE_HYPERLINKCTRL) */
+
#ifndef wxUSE_HTML
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_HTML must be defined."
# endif
#endif /* !defined(wxUSE_NOTEBOOK) */
+#ifndef wxUSE_ODCOMBOBOX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_ODCOMBOBOX must be defined."
+# else
+# define wxUSE_ODCOMBOBOX 0
+# endif
+#endif /* !defined(wxUSE_ODCOMBOBOX) */
+
#ifndef wxUSE_PALETTE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PALETTE must be defined."
# 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 */
/*
check consistency of the settings
*/
+#if WXWIN_COMPATIBILITY_2_4
+# if !WXWIN_COMPATIBILITY_2_6
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "2.4.X compatibility requires 2.6.X compatibility"
+# else
+# undef WXWIN_COMPATIBILITY_2_6
+# define WXWIN_COMPATIBILITY_2_6 1
+# endif
+# endif
+#endif /* WXWIN_COMPATIBILITY_2_4 */
+
+#if wxUSE_ARCHIVE_STREAMS
+# if !wxUSE_DATETIME
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxArchive requires wxUSE_DATETIME"
+# else
+# undef wxUSE_ARCHIVE_STREAMS
+# define wxUSE_ARCHIVE_STREAMS 0
+# endif
+# endif
+#endif /* wxUSE_ARCHIVE_STREAMS */
+
+#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
+# else
+# undef wxUSE_CRASHREPORT
+# define wxUSE_CRASHREPORT 0
+# endif
+#endif /* wxUSE_CRASHREPORT */
+
#if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP
# if !wxUSE_PROTOCOL
# ifdef wxABORT_ON_CONFIG_ERROR
# 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 /* wxUSE_TEXTFILE */
-#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
-# else
-# undef wxUSE_UNICODE
-# define wxUSE_UNICODE 1
-# endif
-#endif /* wxUSE_UNICODE_MSLU */
-
-/* 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"
-# else
-# undef wxUSE_ODBC
-# define wxUSE_ODBC 0
-# endif
-#endif /* wxUSE_ODBC */
-
#if wxUSE_XML && !wxUSE_WCHAR_T
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_XML requires wxUSE_WCHAR_T"
# undef wxUSE_XML
# define wxUSE_XML 0
# endif
-#endif /* wxUSE_UNICODE_MSLU */
+#endif /* wxUSE_XML */
#if !wxUSE_DYNLIB_CLASS
# if wxUSE_DYNAMIC_LOADER
# 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_NOTEBOOK || wxUSE_LISTBOOK
+#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."
# 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
# endif
#endif /* wxGTK && !wxUniv */
-/* wxMSW-specific dependencies */
-#ifdef __WXMSW__
-# ifndef wxUSE_UNICODE_MSLU
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_UNICODE_MSLU must be defined."
-# else
-# 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."
-# else
-# define wxUSE_MS_HTML_HELP 0
-# endif
-# endif /* !defined(wxUSE_MS_HTML_HELP) */
-# ifndef wxUSE_DIALUP_MANAGER
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_DIALUP_MANAGER must be defined."
-# else
-# define wxUSE_DIALUP_MANAGER 0
-# endif
-# endif /* !defined(wxUSE_DIALUP_MANAGER) */
-
-# if !wxUSE_DYNAMIC_LOADER
-# if wxUSE_MS_HTML_HELP
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
-# else
-# define wxUSE_DYNAMIC_LOADER 1
-# endif
-# endif
-# if wxUSE_DIALUP_MANAGER
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
-# else
-# define wxUSE_DYNAMIC_LOADER 1
-# endif
-# endif
-# endif /* wxUSE_DYNAMIC_LOADER */
-#endif /* wxMSW */
-
-/* wxMAC-specific dependencies */
-#ifdef __WXMAC__
-# if wxUSE_UNICODE
-# if !TARGET_CARBON
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_UNICODE is only supported for Carbon Targets."
-# else
-# define wxUSE_UNICODE 0
-# endif
-# endif
-# endif
-#endif /* wxMAC */
-/* wxMotif-specific dependencies */
-#if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
-# undef wxUSE_TAB_DIALOG
-# define wxUSE_TAB_DIALOG 1
-#endif
-
/* wxMGL-specific dependencies */
#ifdef __WXMGL__
# if !wxUSE_PALETTE
#endif /* wxMGL */
/* Hopefully we can emulate these dialogs in due course */
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
# ifdef wxUSE_COLOURDLG
# undef wxUSE_COLOURDLG
# define wxUSE_COLOURDLG 0
# endif
-#endif /* __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 */
# 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"
# if !wxUSE_DOC_VIEW_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
+# error "wxUSE_MDI_ARCHITECTURE requires wxUSE_DOC_VIEW_ARCHITECTURE"
# else
# undef wxUSE_DOC_VIEW_ARCHITECTURE
# define wxUSE_DOC_VIEW_ARCHITECTURE 1
#if !wxUSE_FILEDLG
# if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxFileDialog must be compiled as well"
+# error "wxUSE_FILEDLG is required by wxUSE_DOC_VIEW_ARCHITECTURE and wxUSE_WXHTML_HELP!"
# else
# undef wxUSE_FILEDLG
# define wxUSE_FILEDLG 1
# 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 */
-#endif /* wxUSE_GUI */
+#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