From 0c9da2fa867cd33b4e74de00aeafdc4955149d82 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 Jun 2006 22:04:56 +0000 Subject: [PATCH] moved wxUSE_MS_HTML_HELP to MSW-specific setup.h, it's not used on other platforms git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/setup0.h | 2 -- include/wx/motif/setup0.h | 2 -- include/wx/msw/setup0.h | 11 +++++++++-- include/wx/msw/wince/setup.h | 2 -- include/wx/os2/setup0.h | 2 -- include/wx/palmos/setup0.h | 2 -- include/wx/setup_inc.h | 2 -- setup.h.in | 2 -- setup.h_vms | 3 --- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 7892d9e7d3..6553e78eef 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -998,8 +998,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 7383b34d84..38dfe662a1 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -997,8 +997,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 7f037a297d..dd619890f1 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -997,8 +997,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 @@ -1138,6 +1136,15 @@ #define wxUSE_UNICODE_MSLU 0 #endif +// Should we use MS HTML help for wxHelpController? If disabled, neither +// wxCHMHelpController nor wxBestHelpController are available. +// +// Default is 1 +// +// Recommended setting: 1, only set to 0 if you have trouble compiling +// wxCHMHelpController (could be a problem with really ancient compilers) +#define wxUSE_MS_HTML_HELP 1 + // Set this to 1 if you want to use wxWidgets and MFC in the same program. This // will override some other settings (see below) // diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index bedbb88169..ea72dddc61 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -997,8 +997,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 61c097cbc7..e5bf0dcb99 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -997,8 +997,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 60758eb547..cae1b9934a 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -997,8 +997,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 2228b7f0d4..924ff071f2 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -993,8 +993,6 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 1 - // 0 for no MS HTML Help // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/setup.h.in b/setup.h.in index 306348bfd3..866296b1bf 100644 --- a/setup.h.in +++ b/setup.h.in @@ -449,8 +449,6 @@ #define wxUSE_HELP 0 -#define wxUSE_MS_HTML_HELP 0 - #define wxUSE_WXHTML_HELP 0 diff --git a/setup.h_vms b/setup.h_vms index 0eeb70a4ae..1545d17432 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -477,9 +477,6 @@ typedef pid_t GPid; #define wxUSE_HELP 1 -#define wxUSE_MS_HTML_HELP 0 - - #define wxUSE_WXHTML_HELP 1 #define wxUSE_RESOURCES 1 -- 2.45.2