moved wxUSE_MS_HTML_HELP back into setup_inc.h (undoing change of rev 1.41) as it...

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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 4fccfe72ada74f6624fb7e71838cbdbe3aee3ee9..01a5ed2e82bc343fc74bf4487a391499d92397ec 100644 (file)
--- 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
 
 #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
 
 // 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 a3f504e652eeb76a74f5da99eaefe79c3f263080..23bc554f402593a54a54c95dc0f58523035a3ad9 100644 (file)
--- 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
 
 #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
 
 // 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 0d621a8264e3c06a597355a68ed64f2e60bfbd98..58d755847838e631d70a00ffa51728c114674606 100644 (file)
--- 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
 
 #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
 
 // Use wxHTML-based help controller?
 #define wxUSE_WXHTML_HELP 1
 


@@ -1192,15 +1202,6 @@
     #define wxUSE_UNICODE_MSLU 0
 #endif
 
     #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)
 //
 // 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 f0a7be223ea508ec87de8880624ddc5a3c5cca4e..e0027b359846f99a9ee816db0f9dffc01e9b9c73 100644 (file)
--- 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
 
 #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
 
 // 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 a6a0134bf4fdce75d8d2a014449ca8c85760cdd0..03405feab3f8806eb39291828a5c49636bc0a8c4 100644 (file)
--- 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
 
 #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
 
 // 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 a27aa189b76cdb3078250ba7d8eeb58334b73f68..fb5eacf1d696f4fb17381aab65426da39f609e4c 100644 (file)
--- 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
 
 #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
 
 // 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 36be4c6e6ec382e57b3f2514c538c0b04cc065f5..e0b6cb987e46989b88d53f0de7319cb14b70da9e 100644 (file)
--- 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
 
 #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
 
 // Use wxHTML-based help controller?
 #define wxUSE_WXHTML_HELP 1
 

diff --git a/setup.h.in b/setup.h.in
index 94fa168605f5a91e95fbb58af8764008c0146d62..1e968bbc70fd0fd2dacd24fae179fadc3d51949e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -460,8 +460,10 @@
 
 #define wxUSE_HELP        0
 
 
 #define wxUSE_HELP        0
 

+

 #define wxUSE_MS_HTML_HELP 0
 
 #define wxUSE_MS_HTML_HELP 0
 

+

 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0
 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0