From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 9 Nov 2006 00:59:27 +0000 (+0000)
Subject: override wxUSE_MS_HTML_HELP setting and set it to 0 under platforms other than MSW... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/09f43fd3614f89dc950e2639be396d8fe47ba44e

override wxUSE_MS_HTML_HELP setting and set it to 0 under platforms other than MSW to fix compilation/linking problems in src/common/cshelp.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 5464f418c9..ca1edaf08e 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1466,6 +1466,18 @@
 #   endif
 #endif /* wxUSE_HELP */
 
+#if wxUSE_MS_HTML_HELP
+    /*
+        this doesn't make sense for platforms other than MSW but we still
+        define it in wx/setup_inc.h so don't complain if it happens to be
+        defined under another platform but just silently fix it.
+     */
+#   ifndef __WXMSW__
+#       undef wxUSE_MS_HTML_HELP
+#       define wxUSE_MS_HTML_HELP 0
+#   endif
+#endif /* wxUSE_MS_HTML_HELP */
+
 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR