X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c7f75734a085867c255e35bc53b391c46398a4a..01fd88a0e645fcbee2006534a6d676d066aa0aaa:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 3609cbf68a..cd32106010 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -842,6 +842,25 @@
 #   endif
 #endif /* wxUSE_ODBC */
 
+#if wxUSE_XML && !wxUSE_WCHAR_T
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XML requires wxUSE_WCHAR_T"
+#   else
+#       undef wxUSE_XML
+#       define wxUSE_XML 0
+#   endif
+#endif /* wxUSE_UNICODE_MSLU */
+
+#if !wxUSE_DYNLIB_CLASS
+#   if wxUSE_DYNAMIC_LOADER
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DYNAMIC_LOADER requires wxUSE_DYNLIB_CLASS."
+#       else
+#           define wxUSE_DYNLIB_CLASS 1
+#       endif
+#   endif
+#endif  /* wxUSE_DYNLIB_CLASS */
+
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
@@ -1158,15 +1177,6 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
-
-#   if !wxUSE_DOC_VIEW_ARCHITECTURE
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE"
-#       else
-#           undef wxUSE_DOC_VIEW_ARCHITECTURE
-#           define wxUSE_DOC_VIEW_ARCHITECTURE 1
-#       endif
-#   endif
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #if wxUSE_MDI_ARCHITECTURE