# include "wx/x11/chkconf.h"
#endif
+#ifdef __WXUNIVERSAL__
+# include "wx/univ/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 unset FOO as well
# endif
#endif /* !defined(wxUSE_FILESYSTEM) */
+#ifndef wxUSE_FS_ARCHIVE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FS_ARCHIVE must be defined."
+# else
+# define wxUSE_FS_ARCHIVE 0
+# endif
+#endif /* !defined(wxUSE_FS_ARCHIVE) */
+
/* don't give an error about this one yet, it's not fully implemented */
#ifndef wxUSE_FSVOLUME
# define wxUSE_FSVOLUME 0
preprocessor about invalid integer expression
*/
+#ifndef wxUSE_ABOUTDLG
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_ABOUTDLG must be defined."
+# else
+# define wxUSE_ABOUTDLG 0
+# endif
+#endif /* !defined(wxUSE_ABOUTDLG) */
+
#ifndef wxUSE_ACCEL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_ACCEL must be defined."
# endif
#endif /* !defined(wxUSE_ACCEL) */
+#ifndef wxUSE_ANIMATIONCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_ANIMATIONCTRL must be defined."
+# else
+# define wxUSE_ANIMATIONCTRL 0
+# endif
+#endif /* !defined(wxUSE_ANIMATIONCTRL) */
+
+#ifndef wxUSE_BITMAPCOMBOBOX
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_BITMAPCOMBOBOX must be defined."
+# else
+# define wxUSE_BITMAPCOMBOBOX 0
+# endif
+#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */
+
#ifndef wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BMPBUTTON must be defined."
# endif
#endif /* !defined(wxUSE_CLIPBOARD) */
+#ifndef wxUSE_COLLPANE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_COLLPANE must be defined."
+# else
+# define wxUSE_COLLPANE 0
+# endif
+#endif /* !defined(wxUSE_COLLPANE) */
+
#ifndef wxUSE_COLOURDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_COLOURDLG must be defined."
# endif
#endif /* !defined(wxUSE_GAUGE) */
+#ifndef wxUSE_GRAPHICS_CONTEXT
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_GRAPHICS_CONTEXT must be defined."
+# else
+# define wxUSE_GRAPHICS_CONTEXT 0
+# endif
+#endif /* !defined(wxUSE_GRAPHICS_CONTEXT) */
+
+
#ifndef wxUSE_GRID
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_GRID must be defined."
check consistency of the settings
*/
-#if WXWIN_COMPATIBILITY_2_4
-# if !WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_6
+# if !WXWIN_COMPATIBILITY_2_8
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "2.4.X compatibility requires 2.6.X compatibility"
+# error "2.6.X compatibility requires 2.8.X compatibility"
# else
-# undef WXWIN_COMPATIBILITY_2_6
-# define WXWIN_COMPATIBILITY_2_6 1
+# undef WXWIN_COMPATIBILITY_2_8
+# define WXWIN_COMPATIBILITY_2_8 1
# endif
# endif
-#endif /* WXWIN_COMPATIBILITY_2_4 */
+#endif /* WXWIN_COMPATIBILITY_2_6 */
#if wxUSE_ARCHIVE_STREAMS
# if !wxUSE_DATETIME
# endif
#endif /* wxUSE_HTML */
+#if wxUSE_FS_ARCHIVE
+# if !wxUSE_FILESYSTEM
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxArchiveFSHandler requires wxFileSystem"
+# else
+# undef wxUSE_FILESYSTEM
+# define wxUSE_FILESYSTEM 1
+# endif
+# endif
+# if !wxUSE_ARCHIVE_STREAMS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxArchiveFSHandler requires wxArchive"
+# else
+# undef wxUSE_ARCHIVE_STREAMS
+# define wxUSE_ARCHIVE_STREAMS 1
+# endif
+# endif
+#endif /* wxUSE_FS_ARCHIVE */
+
#if wxUSE_FILESYSTEM
# if !wxUSE_STREAMS
# ifdef wxABORT_ON_CONFIG_ERROR
# define wxUSE_STREAMS 1
# endif
# endif
+# if !wxUSE_FILE && !wxUSE_FFILE
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
+# else
+# undef wxUSE_FILE
+# define wxUSE_FILE 1
+# undef wxUSE_FFILE
+# define wxUSE_FFILE 1
+# endif
+# endif
#endif /* wxUSE_FILESYSTEM */
#if wxUSE_FS_INET
# endif
#endif /* wxUSE_ZIPSTREAM */
+#if wxUSE_TARSTREAM
+# if !wxUSE_ARCHIVE_STREAMS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxTar requires wxArchive"
+# else
+# undef wxUSE_ARCHIVE_STREAMS
+# define wxUSE_ARCHIVE_STREAMS 1
+# endif
+# endif
+#endif /* wxUSE_TARSTREAM */
+
/* the rest of the tests is for the GUI settings only */
#if wxUSE_GUI
# endif
#endif /* wxUSE_BMPBUTTON */
-#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
-# if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
+/*
+ wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
+ are used
+ */
+#ifdef wxUSE_BOOKCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_BOOKCTRL is defined automatically, don't define it"
+# else
+# undef wxUSE_BOOKCTRL
+# endif
+#endif
+
+#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
+ wxUSE_LISTBOOK || \
+ wxUSE_CHOICEBOOK || \
+ wxUSE_TOOLBOOK || \
+ wxUSE_TREEBOOK)
+
+#if wxUSE_COLLPANE
+# if !wxUSE_BUTTON || !wxUSE_STATLINE
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_BOOKCTRL must be set."
+# error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
# else
-# undef wxUSE_BOOKCTRL
+# undef wxUSE_COLLPANE
+# define wxUSE_COLLPANE 0
# endif
# endif
-
-# ifndef wxUSE_BOOKCTRL
-# define wxUSE_BOOKCTRL 1
-# endif
-#endif /* wxUSE_NOTEBOOK */
+#endif /* wxUSE_COLLPANE */
#if wxUSE_LISTBOOK
# if !wxUSE_LISTCTRL
# endif
#endif /* wxUSE_CHOICEBOOK */
+#if wxUSE_TOOLBOOK
+# if !wxUSE_TOOLBAR
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxToolbook requires wxToolBar"
+# else
+# undef wxUSE_TOOLBAR
+# define wxUSE_TOOLBAR 1
+# endif
+# endif
+#endif /* wxUSE_TOOLBOOK */
+
+#if !wxUSE_ODCOMBOBOX
+# if wxUSE_BITMAPCOMBOBOX
+# error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
+# else
+# undef wxUSE_BITMAPCOMBOBOX
+# define wxUSE_BITMAPCOMBOBOX 0
+# endif
+#endif /* !wxUSE_ODCOMBOBOX */
+
/* don't attempt to use native status bar on the platforms not having it */
#ifndef wxUSE_NATIVE_STATUSBAR
# define wxUSE_NATIVE_STATUSBAR 0
# endif
#endif
-/* wxUniv-specific dependencies */
-#if defined(__WXUNIVERSAL__)
-# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
-# else
-# undef wxUSE_POPUPWIN
-# define wxUSE_POPUPWIN 1
-# endif
+#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"
+# else
+# undef wxUSE_GRAPHICS_CONTEXT
+# define wxUSE_GRAPHICS_CONTEXT 0
# endif
+#endif /* wxUSE_GRAPHICS_CONTEXT */
-# if wxUSE_COMBOBOX
-# if !wxUSE_LISTBOX
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxComboBox requires wxListBox in wxUniversal"
-# else
-# undef wxUSE_LISTBOX
-# define wxUSE_LISTBOX 1
-# endif
-# endif
-# endif /* wxUSE_COMBOBOX */
-
-# if wxUSE_RADIOBTN
-# if !wxUSE_CHECKBOX
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
-# else
-# undef wxUSE_CHECKBOX
-# define wxUSE_CHECKBOX 1
-# endif
-# endif
-# endif /* wxUSE_RADIOBTN */
-
-# if wxUSE_TEXTCTRL
-# if !wxUSE_CARET
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxTextCtrl requires wxCaret in wxUniversal"
-# else
-# undef wxUSE_CARET
-# define wxUSE_CARET 1
-# endif
-# endif /* wxUSE_CARET */
-
-# if !wxUSE_SCROLLBAR
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxTextCtrl requires wxScrollBar in wxUniversal"
-# else
-# undef wxUSE_SCROLLBAR
-# define wxUSE_SCROLLBAR 1
-# endif
-# endif /* wxUSE_SCROLLBAR */
-# endif /* wxUSE_TEXTCTRL */
-#endif /* __WXUNIVERSAL__ */
/* wxGTK-specific dependencies */
#ifdef __WXGTK__
# endif
#endif /* wxUSE_HELP */
+#if wxUSE_MS_HTML_HELP
+ /*
+ this doesn't make sense for platforms other than MSW but we still
+ define it in wx/setup_inc.h so don't complain if it happens to be
+ defined under another platform but just silently fix it.
+ */
+# ifndef __WXMSW__
+# undef wxUSE_MS_HTML_HELP
+# define wxUSE_MS_HTML_HELP 0
+# endif
+#endif /* wxUSE_MS_HTML_HELP */
+
#if wxUSE_WXHTML_HELP
# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# endif
#endif /* wxUSE_CLIPBOARD */
-#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxr resources require PrologIO"
-# else
-# undef wxUSE_PROLOGIO
-# define wxUSE_PROLOGIO 1
-# endif
-#endif /* wxUSE_WX_RESOURCES */
-
#if wxUSE_XRC && !wxUSE_XML
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_XRC requires wxUSE_XML"
projects / wxWidgets.git / blobdiff