please keep the options in alphabetical order!
*/
-#ifndef wxUSE_BACKINGFILE
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_BACKINGFILE must be defined."
-# else
-# define wxUSE_BACKINGFILE 0
-# endif
-#endif /* !defined(wxUSE_BACKINGFILE) */
-
#ifndef wxUSE_CRASHREPORT
/* this one is special: as currently it is Windows-only, don't force it
to be defined on other platforms */
# 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 /* 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
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
# else
-# undef wxUSE_FILESYSTEM
-# define wxUSE_FILESYSTEM 0
+# undef wxUSE_FILE
+# define wxUSE_FILE 1
+# undef wxUSE_FFILE
+# define wxUSE_FFILE 1
# endif
# endif
#endif /* wxUSE_FILESYSTEM */
# endif
#endif /* wxUSE_ZIPSTREAM */
-#if wxUSE_FS_ARCHIVE
-# if !wxUSE_ARCHIVE_STREAMS
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxArchiveFSHandler requires wxArchive and wxBackingFile"
-# else
-# undef wxUSE_ARCHIVE_STREAMS
-# define wxUSE_ARCHIVE_STREAMS 1
-# undef wxUSE_BACKINGFILE
-# define wxUSE_BACKINGFILE 1
-# endif
-# endif
-#endif /* wxUSE_FS_ARCHIVE */
-
-#if wxUSE_BACKINGFILE
-# if !wxUSE_STREAMS
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxBackingFile requires wxStream"
-# else
-# undef wxUSE_STREAMS
-# define wxUSE_STREAMS 1
-# endif
-# endif
-# if !wxUSE_FILE && !wxUSE_FFILE
-# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxBackingFile requires wxFile or wxFFile"
-# else
-# undef wxUSE_FFILE
-# define wxUSE_FFILE 1
-# endif
-# endif
-#endif /* wxUSE_BACKINGFILE */
-
#if wxUSE_TARSTREAM
# if !wxUSE_ARCHIVE_STREAMS
# ifdef wxABORT_ON_CONFIG_ERROR
#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_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
+# else
+# undef wxUSE_COLLPANE
+# define wxUSE_COLLPANE 0
+# endif
+# endif
+#endif /* wxUSE_COLLPANE */
+
#if wxUSE_LISTBOOK
# if !wxUSE_LISTCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# 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"
# 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