From 2f0e16e186a58e730e38400f5ddd96df62ee19bb Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 17 Apr 2005 10:54:56 +0000
Subject: [PATCH] wxHelpController now wxCHMHelpController on Windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt           | 3 ++-
 docs/latex/wx/helpinst.tex | 2 +-
 include/wx/help.h          | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 39641b8ab6..ccc8f9a745 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -8,6 +8,7 @@ wxWidgets Change Log - For more verbose changes, see the manual
 All:
 
 - wxPathExists deprecated, use wxDirExists instead.
+- Configure: --enable-std_iostreams, --enable-std_string are now the default.
 
 All (GUI):
 
@@ -18,7 +19,7 @@ wxMSW:
 
 - Fixed static box border when the label is empty.
 - Fixed SetBackgroundColour() to change only label background, not entire box.
-- wxHelpController is now aliased to wxBestHelpController.
+- wxHelpController is now aliased to wxCHMHelpController.
 
 wxWinCE:
 
diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index c7f478064b..3aa871d06b 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -18,7 +18,7 @@ names of the form wxXXXHelpController or wxHelpControllerXXX. An
 appropriate class is aliased to the name wxHelpController for each platform, as follows:
 
 \begin{itemize}\itemsep=0pt
-\item On desktop Windows, wxBestHelpController is used (MS HTML Help or WinHelp).
+\item On desktop Windows, wxCHMHelpController is used (MS HTML Help).
 \item On Windows CE, wxWinceHelpController is used.
 \item On all other platforms, wxHtmlHelpController is used if wxHTML is
 compiled into wxWidgets; otherwise wxExtHelpController is used (for invoking an external
diff --git a/include/wx/help.h b/include/wx/help.h
index 440ba187f5..6cef56c5e2 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -27,10 +27,9 @@
 
     #define wxHelpController wxPalmHelpController
 #elif defined(__WXMSW__)
-    #include "wx/msw/helpbest.h"
+    #include "wx/msw/helpchm.h"
 
-    // CHM or WinHelp, whichever is available
-    #define wxHelpController wxBestHelpController
+    #define wxHelpController wxCHMHelpController
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP
-- 
2.45.2

