Unicode and ODBC are now compatible

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 13b3f70d4aaf7df9fafcd9dfe5216557189a9a8d..46ba51d014cac1eeba4e5c59ddf6b4a881b317d7 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -870,7 +870,9 @@
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 
-#if wxUSE_ODBC && wxUSE_UNICODE
+/* ODBC and Unicode are now compatible */
+
+#if 0 // 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"