reverted wxHVScrolledWindow patch (rev 1.19/1.21 of vscroll.h/.cpp) because not only...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index d034ae1acd44802ac38da12ae2403045b1a01575..ae7b45c4e5f1e5b23ebc099e2e32790d94bef912 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -831,6 +831,17 @@
    check consistency of the settings
  */
 
+#if WXWIN_COMPATIBILITY_2_4
+#   if !WXWIN_COMPATIBILITY_2_6
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "2.4.X compatibility requires 2.6.X compatibility"
+#       else
+#           undef WXWIN_COMPATIBILITY_2_6
+#           define WXWIN_COMPATIBILITY_2_6 1
+#       endif
+#   endif
+#endif /* WXWIN_COMPATIBILITY_2_4 */
+
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -949,6 +960,17 @@
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
+#if wxUSE_ODBC
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxODBC requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_ODBC
+#           define wxUSE_ODBC 0
+#       endif
+#   endif
+#endif /* wxUSE_ODBC */
+
 #if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"