X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cb74906e1ea58aad0cca0a38d1cf87834f577e9..9ca7505f1243ed1d2a2012caa09a52d41115c069:/docs/latex/wx/helpinst.tex

diff --git a/docs/latex/wx/helpinst.tex b/docs/latex/wx/helpinst.tex
index 7aae0d97e7..fc91ec9cac 100644
--- a/docs/latex/wx/helpinst.tex
+++ b/docs/latex/wx/helpinst.tex
@@ -19,12 +19,12 @@ appropriate class is aliased to the name wxHelpController for each platform, as
 
 \begin{itemize}\itemsep=0pt
 \item On Windows, wxWinHelpController is used.
-\item On all other platforms, wxHelpControllerHtml is used if wxHTML is
-compiled into wxWindows; otherwise wxExtHelpController is used (for invoking an external
+\item On all other platforms, wxHtmlHelpController is used if wxHTML is
+compiled into wxWidgets; otherwise wxExtHelpController is used (for invoking an external
 browser).
 \end{itemize}
 
-The remaining help controller classess need to be named
+The remaining help controller classes need to be named
 explicitly by an application that wishes to make use of them.
 
 There are currently the following help controller classes defined:
@@ -32,15 +32,21 @@ There are currently the following help controller classes defined:
 \begin{itemize}\itemsep=0pt
 \item wxWinHelpController, for controlling Windows Help.
 \item wxCHMHelpController, for controlling MS HTML Help. To use this, you need to set wxUSE\_MS\_HTML\_HELP
-to 0 in setup.h, and link your application with Microsoft's htmlhelp.lib. Currently VC++ only.
+to 1 in setup.h and have htmlhelp.h header from Microsoft's HTML Help kit (you don't need
+VC++ specific htmlhelp.lib because wxWidgets loads necessary DLL at runtime and so it
+works with all compilers).
+\item wxBestHelpController, for controlling MS HTML Help or, if Microsoft's runtime is
+not available, \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}. You need to provide
+{\bf both} CHM and HTB versions of the help file. For 32bit Windows only.
 \item wxExtHelpController, for controlling external browsers under Unix.
 The default browser is Netscape Navigator. The 'help' sample shows its use.
-\item wxHelpControllerHtml, using \helpref{wxHTML}{wxhtml} to display help. See {\tt wx/helpwxht.h} for
-details of use.
-\item \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}, a more sophisticated help controller using \helpref{wxHTML}{wxhtml}, in
+\item \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}, a sophisticated help controller using \helpref{wxHTML}{wxhtml}, in
 a similar style to the Microsoft HTML Help viewer and using some of the same files.
 Although it has an API compatible with other help controllers, it has more advanced features, so it is
-recommended that you use the specific API for this class instead.
+recommended that you use the specific API for this class instead. Note that if you
+use .zip or .htb formats for your books, you
+must add this line to your application initialization: {\tt wxFileSystem::AddHandler(new wxZipFSHandler);}
+or nothing will be shown in your help window.
 \end{itemize}
 
 \wxheading{Derived from}
@@ -50,13 +56,12 @@ wxHelpControllerBase\\
 
 \wxheading{Include files}
 
-<wx/help.h> (wxWindows chooses the appropriate help controller class)\\
+<wx/help.h> (wxWidgets chooses the appropriate help controller class)\\
 <wx/helpbase.h> (wxHelpControllerBase class)\\
 <wx/helpwin.h> (Windows Help controller)\\
 <wx/msw/helpchm.h> (MS HTML Help controller)\\
 <wx/generic/helpext.h> (external HTML browser controller)\\
-<wx/generic/helpwxht.h> (simple wxHTML-based help controller)\\
-<wx/html/helpctrl.h> (advanced wxHTML based help controller: wxHtmlHelpController)
+<wx/html/helpctrl.h> (wxHTML based help controller: wxHtmlHelpController)
 
 \wxheading{See also}
 
@@ -89,9 +94,7 @@ any attempts to communicate with the viewer.
 
 You may omit the file extension and a suitable one will be chosen. For
 wxHtmlHelpController, the extensions zip, htb and hhp will be appended while searching for
-a suitable file. For WinHelp, the hlp extension is appended. For wxHelpControllerHtml (the
-standard HTML help controller), the filename is assumed to be a directory containing
-the HTML files.
+a suitable file. For WinHelp, the hlp extension is appended.
 
 \membersection{wxHelpController::DisplayBlock}\label{wxhelpcontrollerdisplayblock}
 
@@ -122,7 +125,7 @@ contents.
 
 Displays the section as a popup window using a context id.
 
-Returns FALSE if unsuccessful or not implemented.
+Returns false if unsuccessful or not implemented.
 
 \membersection{wxHelpController::DisplaySection}\label{wxhelpcontrollerdisplaysection}
 
@@ -131,8 +134,8 @@ Returns FALSE if unsuccessful or not implemented.
 If the help viewer is not running, runs it and displays the given section.
 
 The interpretation of {\it section} differs between help viewers. For most viewers,
-this call is equivalent to KeywordSearch. For MS HTML Help, external HTML help
-and simple wxHTML help, if {\it section} has a .htm
+this call is equivalent to KeywordSearch. For MS HTML Help, wxHTML help and external HTML help,
+if {\it section} has a .htm
 or .html extension, that HTML file will be displayed; otherwise
 a keyword search is done.
 
@@ -140,9 +143,9 @@ a keyword search is done.
 
 If the help viewer is not running, runs it and displays the given section.
 
-{\it WinHelp, MS HTML Help:} {\it sectionNo} is a context id.
+{\it WinHelp, MS HTML Help} {\it sectionNo} is a context id.
 
-{\it External HTML help/simple wxHTML help:} wxExtHelpController and wxHelpControllerHtml implement {\it sectionNo} as an id in a map file, which is of the form:
+{\it External HTML help:} wxExtHelpController implements {\it sectionNo} as an id in a map file, which is of the form:
 
 \begin{verbatim}
 0  wx.html             ; Index
@@ -160,22 +163,14 @@ See also the help sample for notes on how to specify section numbers for various
 
 Displays the text in a popup window, if possible.
 
-Returns FALSE if unsuccessful or not implemented.
+Returns false if unsuccessful or not implemented.
 
 \membersection{wxHelpController::GetFrameParameters}\label{wxhelpcontrollergetframeparameters}
 
 \func{virtual wxFrame *}{GetFrameParameters}{\param{const wxSize * }{size = NULL}, \param{const wxPoint * }{pos = NULL},
  \param{bool *}{newFrameEachTime = NULL}}
 
-This reads the current settings for the help frame in the case of the
-wxHelpControllerHtml, setting the frame size, position and
-the newFrameEachTime parameters to the last values used. It also
-returns the pointer to the last opened help frame. This can be used
-for example, to automatically close the help frame on program
-shutdown.
-
-wxHtmlHelpController returns the frame,
-size and position.
+wxHtmlHelpController returns the frame, size and position.
 
 For all other help controllers, this function does nothing
 and just returns NULL.
@@ -189,10 +184,13 @@ that the viewer is a variant of Netscape Navigator.}
 
 \membersection{wxHelpController::KeywordSearch}\label{wxhelpcontrollerkeywordsearch}
 
-\func{virtual bool}{KeywordSearch}{\param{const wxString\& }{keyWord}}
+\func{virtual bool}{KeywordSearch}{\param{const wxString\& }{keyWord}, \param{wxHelpSearchMode }{mode = wxHELP\_SEARCH\_ALL}}
 
-If the help viewer is not running, runs it, and searches for sections matching the given keyword. If one
-match is found, the file is displayed at this section.
+If the help viewer is not running, runs it, and searches for sections matching
+the given keyword. If one match is found, the file is displayed at this
+section. The optional parameter allows the search the index
+(wxHELP\_SEARCH\_INDEX) but this currently only supported by the
+wxHtmlHelpController.
 
 {\it WinHelp, MS HTML Help:} If more than one match is found, 
 the first topic is displayed.
@@ -227,13 +225,7 @@ This does not work for all help controllers.
 
 \func{virtual void}{SetFrameParameters}{\param{const wxString \& }{title},
  \param{const wxSize \& }{size}, \param{const wxPoint \& }{pos = wxDefaultPosition},
- \param{bool }{newFrameEachTime = FALSE}}
-
-For wxHelpControllerHtml, this allows the application to set the
-default frame title, size and position for the frame. If the title
-contains \%s, this will be replaced with the page title. If the
-parameter newFrameEachTime is set, the controller will open a new
-help frame each time it is called.
+ \param{bool }{newFrameEachTime = false}}
 
 For wxHtmlHelpController, the title is set (again with \%s indicating the
 page title) and also the size and position of the frame if the frame is already
