From 62cdd7d3f80a9a5ef48041695008bbdbf319e9c2 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 8 May 2004 09:38:14 +0000 Subject: [PATCH] CHM help is not compiled for wxUniversal. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/helpbest.h | 3 ++- src/msw/helpbest.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index 003f100e8e..5c735c65d9 100644 --- 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 be1e404cde..bb1aad5059 100644 --- 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" -- 2.45.2