Updated Scintilla to version 1.70

[wxWidgets.git] / include / wx / msw / setup0.h

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
                                 // 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
 
 // Use wxHTML-based help controller?
 #define wxUSE_WXHTML_HELP 1


@@ -1138,6 +1136,15 @@
     #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)
 //