# 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
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_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."
# 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_FILESYSTEM
+# define wxUSE_FILESYSTEM 0
+# endif
+# endif
#endif /* wxUSE_FILESYSTEM */
#if wxUSE_FS_INET
# 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__