From f05b5b774f384373f928d171a5f2cc43679b6a1b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 8 Oct 2006 20:48:48 +0000 Subject: [PATCH] moved wxUSE_MS_HTML_HELP back into setup_inc.h (undoing change of rev 1.41) as it's needed for configure builds too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/setup0.h | 10 ++++++++++ include/wx/motif/setup0.h | 10 ++++++++++ include/wx/msw/setup0.h | 19 ++++++++++--------- include/wx/msw/wince/setup.h | 10 ++++++++++ include/wx/os2/setup0.h | 10 ++++++++++ include/wx/palmos/setup0.h | 10 ++++++++++ include/wx/setup_inc.h | 10 ++++++++++ setup.h.in | 2 ++ 8 files changed, 72 insertions(+), 9 deletions(-) diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 4fccfe72ad..01a5ed2e82 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -1039,6 +1039,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // 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 a3f504e652..23bc554f40 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -1038,6 +1038,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // 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 0d621a8264..58d7558478 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1038,6 +1038,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 @@ -1192,15 +1202,6 @@ #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 f0a7be223e..e0027b3598 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -1038,6 +1038,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // 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 a6a0134bf4..03405feab3 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -1038,6 +1038,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // 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 a27aa189b7..fb5eacf1d6 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -1038,6 +1038,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // 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 36be4c6e6e..e0b6cb987e 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -1034,6 +1034,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// 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 + + // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 diff --git a/setup.h.in b/setup.h.in index 94fa168605..1e968bbc70 100644 --- a/setup.h.in +++ b/setup.h.in @@ -460,8 +460,10 @@ #define wxUSE_HELP 0 + #define wxUSE_MS_HTML_HELP 0 + #define wxUSE_WXHTML_HELP 0 #define wxUSE_RESOURCES 0 -- 2.45.2