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

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 7892d9e7d39342140a25409470a08b94a3fc9837..6553e78eef2ab5d8e78f2b7f62cc81a1582b1cb6 100644 (file)
--- 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 7383b34d84a44f43caec581a0afa3d5439d4ac47..38dfe662a1d51de406cd661501e17d64ec042974 100644 (file)
--- 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 7f037a297d505e5dedb5b24936fccbb08f51fe8f..dd619890f19c89cb54d7ceae8ee50da7fde7fe3f 100644 (file)
--- 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 bedbb881699abbbf22a7f0fefc4a4123547c3c40..ea72dddc6174f3cf0bfd5dc414bfe27b83cf574a 100644 (file)
--- 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 61c097cbc7dc94d138b2ed07e4a6d2d73e42a427..e5bf0dcb99ac4139d656e244150c3c4d4231e5a7 100644 (file)
--- 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 60758eb5477f3e9a798af8087a2a7b7fc4e0c924..cae1b9934a8033fea2cce609e7bbe7df97864edc 100644 (file)
--- 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 2228b7f0d4e66d4f05e16ba474a53df899401591..924ff071f20f3da15d3898b6998d112786b68bc0 100644 (file)
--- 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 306348bfd370636b4a59aa5af07b9064785a19cd..866296b1bf4b35d10a61c3c0b590fce5625d7bbe 100644 (file)
--- 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 0eeb70a4ae0b31baf6ba8e8feaa731c8862b5d2a..1545d17432c0fb2f3e4dc6ee61ce8b2f1c498504 100644 (file)
--- 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