X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b5e4f325c734b239c5e6fa6931e3cd0aac66a0e..5bc97d1b81910a82e249f6227798b42089149f94:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 2283731933..4d5fd211a2 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -50,6 +50,14 @@
 #   endif
 #endif /* !defined(wxUSE_DYNLIB_CLASS) */
 
+#ifndef wxUSE_EXCEPTIONS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_EXCEPTIONS must be defined."
+#   else
+#       define wxUSE_EXCEPTIONS 0
+#   endif
+#endif /* !defined(wxUSE_EXCEPTIONS) */
+
 #ifndef wxUSE_FILESYSTEM
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_FILESYSTEM must be defined."
@@ -323,6 +331,14 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
+#ifndef wxUSE_DISPLAY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DISPLAY must be defined."
+#   else
+#       define wxUSE_DISPLAY 0
+#   endif
+#endif /* !defined(wxUSE_DISPLAY) */
+
 #ifndef wxUSE_DOC_VIEW_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
@@ -387,6 +403,19 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
+#ifndef wxUSE_LIBMSPACK
+#   ifndef __UNIX__
+        /* set to 0 on platforms that don't have libmspack */
+#       define wxUSE_LIBMSPACK 0
+#   else
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_LIBMSPACK must be defined."
+#       else
+#           define wxUSE_LIBMSPACK 0
+#       endif
+#   endif
+#endif /* !defined(wxUSE_LIBMSPACK) */
+
 #ifndef wxUSE_ICO_CUR
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ICO_CUR must be defined."
@@ -683,13 +712,13 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
-#ifndef wxUSE_DISPLAY
+#ifndef wxUSE_VALIDATORS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DISPLAY must be defined."
+#       error "wxUSE_VALIDATORS must be defined."
 #   else
-#       define wxUSE_DISPLAY 0
+#       define wxUSE_VALIDATORS 0
 #   endif
-#endif /* !defined(wxUSE_TREECTRL) */
+#endif /* !defined(wxUSE_VALIDATORS) */
 
 #ifndef wxUSE_WXHTML_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
@@ -749,6 +778,17 @@
 #   endif
 #endif /* wxUSE_PROTOCOL */
 
+#if wxUSE_GZSTREAM
+#   if !wxUSE_ZLIB
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_GZSTREAM requires wxUSE_ZLIB"
+#       else
+#           undef wxUSE_ZLIB
+#           define wxUSE_ZLIB 1
+#       endif
+#   endif
+#endif /* wxUSE_GZSTREAM */
+
 /* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
 #if wxUSE_HTML
 #   if !wxUSE_FILESYSTEM