wxHelpController now wxCHMHelpController on Windows

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 39641b8ab6288c40e1bb0c56ca7b6a8426a73c84..ccc8f9a745a55bd372066ee8e4e52b0d845831a5 100644 (file)
--- 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.
 All:
 
 - wxPathExists deprecated, use wxDirExists instead.

+- Configure: --enable-std_iostreams, --enable-std_string are now the default.

 
 All (GUI):
 
 
 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.
 
 - 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:
 
 
 wxWinCE:
 

diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index c7f478064b46cc55830014f25895e0cee35ece5e..3aa871d06b142232bf7206141873731bdf2c4f6c 100644 (file)
--- 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
 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
 \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 440ba187f507c028383d5368905214615734db10..6cef56c5e2fff0e3832917758a1ef25b2fb0d377 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -27,10 +27,9 @@
 
     #define wxHelpController wxPalmHelpController
 #elif defined(__WXMSW__)
 
     #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
 #else // !MSW
 
 #if wxUSE_WXHTML_HELP