removed redundant code

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index e11fad03ac606294f14113e87436a2fb8331adc4..1f4d44c86d395b2b2424e74bd9b7b55b4a10417f 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -50,12 +50,9 @@
 #   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
 #ifndef wxUSE_FSVOLUME

-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FSVOLUME
-#   else
-#       define wxUSE_FSVOLUME 0
-#   endif
+#   define wxUSE_FSVOLUME 0

 #endif /* !defined(wxUSE_FSVOLUME) */
 
 #ifndef wxUSE_DYNAMIC_LOADER
 #endif /* !defined(wxUSE_FSVOLUME) */
 
 #ifndef wxUSE_DYNAMIC_LOADER


@@ -776,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