CHM help is not compiled for wxUniversal.

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 003f100e8e63e353e3228cb291d52166056d8422..5c735c65d91dd26fba24b2076a17412d498da6a9 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -16,7 +16,8 @@
 #pragma interface "helpbest.h"
 #endif
 
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+    && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/helpbase.h"
 

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index be1e404cdea4a2e899c3189a5118632845cebcdf..bb1aad5059984d58826f1bdea7f77140dd5a2c8d 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -27,7 +27,9 @@
 #include "wx/filefn.h"
 #include "wx/log.h"
 
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+    && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
+
 #include "wx/msw/helpchm.h"
 #include "wx/html/helpctrl.h"
 #include "wx/msw/helpbest.h"