X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0c749a72f391a5180b84911be22132652aa5374..7cb1b9a91c6c2cfedf38258791628d11bab9879c:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 13b3f70d4a..c752d25709 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -592,6 +592,14 @@
 #   endif
 #endif /* !defined(wxUSE_SLIDER) */
 
+#ifndef wxUSE_SOUND
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOUND must be defined."
+#   else
+#       define wxUSE_SOUND 0
+#   endif
+#endif /* !defined(wxUSE_SOUND) */
+
 #ifndef wxUSE_SPINBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SPINBTN must be defined."
@@ -870,7 +878,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"