# endif
#endif /* !defined(wxUSE_DYNLIB_CLASS) */
+#ifndef wxUSE_FILESYSTEM
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FILESYSTEM must be defined."
+# else
+# define wxUSE_FILESYSTEM 0
+# endif
+#endif /* !defined(wxUSE_FILESYSTEM) */
+
/* don't give an error about this one yet, it's not fully implemented */
#ifndef wxUSE_FSVOLUME
# define wxUSE_FSVOLUME 0
# endif
#endif /* !defined(wxUSE_MIMETYPE) */
+#ifndef wxUSE_PROLOGIO
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_PROLOGIO must be defined."
+# else
+# define wxUSE_PROLOGIO 0
+# endif
+#endif /* !defined(wxUSE_PROLOGIO) */
+
#ifndef wxUSE_PROTOCOL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PROTOCOL must be defined."
# endif
#endif /* !defined(wxUSE_TREECTRL) */
+#ifndef wxUSE_WX_RESOURCES
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_WX_RESOURCES must be defined."
+# else
+# define wxUSE_WX_RESOURCES 0
+# endif
+#endif /* !defined(wxUSE_WX_RESOURCES) */
+
#ifndef wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WXHTML_HELP must be defined."
# endif
#endif /* wxUSE_PROTOCOL */
-/* non GUI settings */
-#if wxUSE_STOPWATCH
+/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
+#if wxUSE_HTML
+# if !wxUSE_FILESYSTEM
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxHTML requires wxFileSystem"
+# else
+# undef wxUSE_FILESYSTEM
+# define wxUSE_FILESYSTEM 1
+# endif
+# endif
+#endif /* wxUSE_HTML */
+
+#if wxUSE_FILESYSTEM
+# if !wxUSE_STREAMS
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_FILESYSTEM requires wxUSE_STREAMS"
+# else
+# undef wxUSE_STREAMS
+# define wxUSE_STREAMS 1
+# endif
+# endif
+#endif /* wxUSE_FILESYSTEM */
+
+#if wxUSE_STOPWATCH || wxUSE_DATETIME
# if !wxUSE_LONGLONG
# ifdef wxABORT_ON_CONFIG_ERROR
-# error "wxUSE_STOPWATCH requires wxUSE_LONGLONG"
+# error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG"
# else
# undef wxUSE_LONGLONG
# define wxUSE_LONGLONG 1
# define wxUSE_TOGGLEBTN 0
#endif
+/* wxMGL-specific dependencies */
+#ifdef __WXMGL__
+# if !wxUSE_PALETTE
+# error "wxMGL requires wxUSE_PALETTE=1"
+# endif
+#endif /* wxMGL */
+
/* generic controls dependencies */
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
# 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 */
+
#endif /* wxUSE_GUI */