A few tweaks and cleanups

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index d1cbd51389a30af21b32b241333d40d19d770cb9..1f4d44c86d395b2b2424e74bd9b7b55b4a10417f 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -19,6 +19,24 @@
  */
 #define wxABORT_ON_CONFIG_ERROR
 
  */
 #define wxABORT_ON_CONFIG_ERROR
 

+/*
+   global features
+ */
+
+/* GUI build by default */
+#if !defined(wxUSE_GUI)
+#   define wxUSE_GUI 1
+#endif /* !defined(wxUSE_GUI) */
+
+/* wxBase doesn't need compatibility settings as it's a new port */
+#if !wxUSE_GUI
+#   undef WXWIN_COMPATIBILITY
+#   undef WXWIN_COMPATIBILITY_2
+#   undef WXWIN_COMPATIBILITY_2_2
+#   define WXWIN_COMPATIBILITY 0
+#   define WXWIN_COMPATIBILITY_2 0
+#   define WXWIN_COMPATIBILITY_2_2 0
+#endif /* !wxUSE_GUI */

 
 /*
    tests for non GUI features
 
 /*
    tests for non GUI features


@@ -32,6 +50,11 @@
 #   endif
 #endif /* !defined(wxUSE_DYNLIB_CLASS) */
 
 #   endif
 #endif /* !defined(wxUSE_DYNLIB_CLASS) */
 

+/* don't give an error about this one yet, it's not fully implemented */
+#ifndef wxUSE_FSVOLUME
+#   define wxUSE_FSVOLUME 0
+#endif /* !defined(wxUSE_FSVOLUME) */
+

 #ifndef wxUSE_DYNAMIC_LOADER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DYNAMIC_LOADER must be defined."
 #ifndef wxUSE_DYNAMIC_LOADER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DYNAMIC_LOADER must be defined."


@@ -348,6 +371,22 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 

+#ifndef wxUSE_ICO_CUR
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ICO_CUR must be defined."
+#   else
+#       define wxUSE_ICO_CUR 0
+#   endif
+#endif /* !defined(wxUSE_ICO_CUR) */
+
+#ifndef wxUSE_IFF
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_IFF must be defined."
+#   else
+#       define wxUSE_IFF 0
+#   endif
+#endif /* !defined(wxUSE_IFF) */
+

 #ifndef wxUSE_IMAGLIST
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_IMAGLIST must be defined."
 #ifndef wxUSE_IMAGLIST
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_IMAGLIST must be defined."


@@ -734,6 +773,16 @@
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 

+#if 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 */
+

 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 


@@ -878,7 +927,7 @@
 #       endif
 #   endif /* !defined(wxUSE_DIALUP_MANAGER) */
 
 #       endif
 #   endif /* !defined(wxUSE_DIALUP_MANAGER) */
 

-#   if !(wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS)
+#   if !wxUSE_DYNAMIC_LOADER

 #       if wxUSE_MS_HTML_HELP
 #           ifdef wxABORT_ON_CONFIG_ERROR
 #               error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
 #       if wxUSE_MS_HTML_HELP
 #           ifdef wxABORT_ON_CONFIG_ERROR
 #               error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."