further wxABI_VERSION fixes

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index eb95a01b3d32faabc3d6a7c12c798e2775e4b406..e9760937ac964bf65f382ad3da699e1b4006a056 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -70,7 +70,9 @@
  */
 
 #ifndef wxUSE_CRASHREPORT
-#   ifdef wxABORT_ON_CONFIG_ERROR
+    /* this one is special: as currently it is Windows-only, don't force it
+       to be defined on other platforms */
+#   if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__)
 #       error "wxUSE_CRASHREPORT must be defined."
 #   else
 #       define wxUSE_CRASHREPORT 0
@@ -950,15 +952,6 @@
 #   endif
 #endif /* wxUSE_TEXTFILE */
 
-#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
-#   else
-#       undef wxUSE_UNICODE
-#       define wxUSE_UNICODE 1
-#   endif
-#endif /* wxUSE_UNICODE_MSLU */
-
 #if wxUSE_XML && !wxUSE_WCHAR_T
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML requires wxUSE_WCHAR_T"
@@ -966,7 +959,7 @@
 #       undef wxUSE_XML
 #       define wxUSE_XML 0
 #   endif
-#endif /* wxUSE_UNICODE_MSLU */
+#endif /* wxUSE_XML */
 
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
@@ -1520,7 +1513,7 @@
 
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
+#            error "wxUSE_MDI_ARCHITECTURE requires wxUSE_DOC_VIEW_ARCHITECTURE"
 #        else
 #            undef wxUSE_DOC_VIEW_ARCHITECTURE
 #            define wxUSE_DOC_VIEW_ARCHITECTURE 1
@@ -1531,7 +1524,7 @@
 #if !wxUSE_FILEDLG
 #   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxFileDialog must be compiled as well"
+#           error "wxUSE_FILEDLG is required by wxUSE_DOC_VIEW_ARCHITECTURE and wxUSE_WXHTML_HELP!"
 #       else
 #           undef wxUSE_FILEDLG
 #           define wxUSE_FILEDLG 1
@@ -1691,4 +1684,3 @@
 #endif /* wxUSE_SOCKETS */
 
 #endif /* wxUSE_GUI */
-