X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 25497ebb13..7a03b31938 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -181,6 +181,14 @@
 #   endif
 #endif /* !defined(wxUSE_LISTCTRL) */
 
+#ifndef wxUSE_MSGDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MSGDLG must be defined."
+#   else
+#       define wxUSE_MSGDLG 0
+#   endif
+#endif /* !defined(wxUSE_MSGDLG) */
+
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_MDI_ARCHITECTURE must be defined."
@@ -449,7 +457,7 @@
 #endif /* wxUSE_COMBOBOX */
 
 #if !wxUSE_FILEDLG
-#   if defined(wxUSE_DOC_VIEW_ARCHITECTURE) || defined(wxUSE_HTML)
+#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else
@@ -457,10 +465,10 @@
 #           define wxUSE_FILEDLG 1
 #       endif
 #   endif
-#endif /* !wxUSE_FILEDLG */
+#endif /* wxUSE_FILEDLG */
 
 #if !wxUSE_FONTDLG
-#   if defined(wxUSE_FONTMAP)
+#   if wxUSE_FONTMAP
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFontDialog must be compiled as well"
 #       else
@@ -481,6 +489,16 @@
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 
+#if !wxUSE_MSGDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+        /* FIXME: should compile without it, of course, but doesn't */
+#       error "wxMessageBox is always needed"
+#   else
+#       undef wxUSE_MSGDLG
+#       define wxUSE_MSGDLG 1
+#   endif
+#endif
+
 #if wxUSE_RADIOBTN
 #   if defined(__WXUNIVERSAL__) && !wxUSE_CHECKBOX
 #        ifdef wxABORT_ON_CONFIG_ERROR