From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 12 Jan 2004 10:51:45 +0000 (+0000)
Subject: Unicode and ODBC are now compatible
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/38a0984e4c5d21103d06a51b4aa1afd68a0843c0

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 13b3f70d4a..46ba51d014 100644
--- 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"