Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved wxUSE_MS_HTML_HELP to MSW-specific setup.h, it's not used on other platforms

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-06-30 22:04:56 +00:00
parent 4d8b1e4791
commit 0c9da2fa86
9 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/setup0.h
View File

@@ -998,8 +998,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

2
include/wx/motif/setup0.h
View File

@@ -997,8 +997,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

11
include/wx/msw/setup0.h
View File

@@ -997,8 +997,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1
@@ -1138,6 +1136,15 @@
#define wxUSE_UNICODE_MSLU 0 #define wxUSE_UNICODE_MSLU 0
#endif #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 // Set this to 1 if you want to use wxWidgets and MFC in the same program. This
// will override some other settings (see below) // will override some other settings (see below)
// //

2
include/wx/msw/wince/setup.h
View File

@@ -997,8 +997,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

2
include/wx/os2/setup0.h
View File

@@ -997,8 +997,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

2
include/wx/palmos/setup0.h
View File

@@ -997,8 +997,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

2
include/wx/setup_inc.h
View File

@@ -993,8 +993,6 @@
// 0 for no interprocess comms // 0 for no interprocess comms
#define wxUSE_HELP 1 #define wxUSE_HELP 1
// 0 for no help facility // 0 for no help facility
#define wxUSE_MS_HTML_HELP 1
// 0 for no MS HTML Help
// Use wxHTML-based help controller? // Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1

2
setup.h.in
View File

@@ -449,8 +449,6 @@
#define wxUSE_HELP 0 #define wxUSE_HELP 0
#define wxUSE_MS_HTML_HELP 0
#define wxUSE_WXHTML_HELP 0 #define wxUSE_WXHTML_HELP 0

3
setup.h_vms
View File

@@ -477,9 +477,6 @@ typedef pid_t GPid;
#define wxUSE_HELP 1 #define wxUSE_HELP 1
#define wxUSE_MS_HTML_HELP 0
#define wxUSE_WXHTML_HELP 1 #define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 1 #define wxUSE_RESOURCES 1