X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29ea4a290850e9ae79c258774fa22153a951ff7f..abb69c6c82d61cf18f14270650a68896a3d8ed47:/include/wx/generic/helphtml.h?ds=inline diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h index 647d54549c..44a5cbc4a2 100644 --- a/include/wx/generic/helphtml.h +++ b/include/wx/generic/helphtml.h @@ -16,6 +16,7 @@ #endif #include "wx/helpbase.h" +#include "wx/frame.h" /// Name for map file. #define WXEXTHELP_MAPFILE "wxhelp.map" @@ -102,6 +103,10 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase) /** Display help for id sectionNo -- identical with DisplaySection(). @return true on success */ + virtual bool DisplaySection(const wxString& section); + /** Display help for URL (using DisplayHelp) or keyword (using KeywordSearch) + @return true on success + */ virtual bool DisplayBlock(long blockNo); /** Search comment/documentation fields in map file and present a list to chose from. @@ -116,22 +121,23 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase) virtual void OnQuit(void); /// Call the browser using a relative URL. - virtual bool DisplayHelp(wxString const &) = 0; + virtual bool DisplayHelp(const wxString &) = 0; /// Allows one to override the default settings for the help frame. - virtual void SetFrameParameters(const wxString &title, - const wxSize &size, - const wxPoint &pos = wxDefaultPosition, - bool newFrameEachTime = FALSE) + virtual void SetFrameParameters(const wxString& WXUNUSED(title), + const wxSize& WXUNUSED(size), + const wxPoint& WXUNUSED(pos) = wxDefaultPosition, + bool WXUNUSED(newFrameEachTime) = FALSE) { // does nothing by default } - /// Obtains the latest settings used by the help frame. - virtual void GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL) + /// Obtains the latest settings used by the help frame and the help + /// frame. + virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL, + wxPoint *WXUNUSED(pos) = NULL, + bool *WXUNUSED(newFrameEachTime) = NULL) { - // does nothing by default + return (wxFrame*) NULL;// does nothing by default } protected: