Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1cd1afe4604525bd83d45b88473062a2313ad799..1f4d44c86d395b2b2424e74bd9b7b55b4a10417f 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -773,6 +773,16 @@
 #   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