X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a43eaecc1d97c81de2c45816117c9addccbdd21..12a480c12d7b7edf19304ea96a269b080d6aa622:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index a991742cb7..6c9729b5fb 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -23,6 +23,10 @@
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXMAC__)
 #  include "wx/mac/chkconf.h"
+#elif defined(__OS2__)
+#  include "wx/os2/chkconf.h"
+#elif defined(__WXMGL__)
+#  include "wx/mgl/chkconf.h"
 #elif defined(__WXMOTIF__)
 #  include "wx/motif/chkconf.h"
 #endif
@@ -67,6 +71,8 @@
 
 /*
    tests for non GUI features
+
+   please keep the options in alphabetical order!
  */
 
 #ifndef wxUSE_CRASHREPORT
@@ -272,6 +278,8 @@
 
 /*
    all these tests are for GUI only
+
+   please keep the options in alphabetical order!
  */
 #if wxUSE_GUI
 
@@ -384,6 +392,14 @@
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 
+#ifndef wxUSE_COMBOCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COMBOCTRL must be defined."
+#   else
+#       define wxUSE_COMBOCTRL 0
+#   endif
+#endif /* !defined(wxUSE_COMBOCTRL) */
+
 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATAOBJ must be defined."
@@ -392,6 +408,14 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
+#ifndef wxUSE_DATAVIEWCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DATAVIEWCTRL must be defined."
+#   else
+#       define wxUSE_DATAVIEWCTRL 0
+#   endif
+#endif /* !defined(wxUSE_DATAVIEWCTRL) */
+
 #ifndef wxUSE_DATEPICKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATEPICKCTRL must be defined."
@@ -472,14 +496,6 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
-#ifndef wxUSE_XRC
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XRC must be defined."
-#   else
-#       define wxUSE_XRC 0
-#   endif
-#endif /* !defined(wxUSE_XRC) */
-
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */
@@ -613,6 +629,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
+#ifndef wxUSE_ODCOMBOBOX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ODCOMBOBOX must be defined."
+#   else
+#       define wxUSE_ODCOMBOBOX 0
+#   endif
+#endif /* !defined(wxUSE_ODCOMBOBOX) */
+
 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PALETTE must be defined."
@@ -821,12 +845,42 @@
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 
+#ifndef wxUSE_XRC
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC must be defined."
+#   else
+#       define wxUSE_XRC 0
+#   endif
+#endif /* !defined(wxUSE_XRC) */
+
 #endif /* wxUSE_GUI */
 
 /*
    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
+#           error "wxArchive requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 0
+#       endif
+#   endif
+#endif /* wxUSE_ARCHIVE_STREAMS */
+
 #if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
@@ -934,6 +988,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"