X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..9213ca5d473ff8a25e003e46e7ea7f8520f08fb9:/include/wx/html/helpctrl.h?ds=sidebyside diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index f5f285d8b7..06e6bdc7ee 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -14,18 +14,18 @@ #include "wx/defs.h" -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "helpctrl.h" #endif #if wxUSE_WXHTML_HELP -#include "wx/html/helpfrm.h" #include "wx/helpbase.h" +#include "wx/html/helpfrm.h" #define wxID_HTML_HELPFRAME (wxID_HIGHEST + 1) -class WXDLLEXPORT wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler +class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler { DECLARE_DYNAMIC_CLASS(wxHtmlHelpController) @@ -35,13 +35,15 @@ public: void SetTitleFormat(const wxString& format); void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); } - bool AddBook(const wxString& book, bool show_wait_msg = FALSE); + bool AddBook(const wxString& book_url, bool show_wait_msg = FALSE); + bool AddBook(const wxFileName& book_file, bool show_wait_msg = FALSE); bool Display(const wxString& x); bool Display(int id); bool DisplayContents(); bool DisplayIndex(); - bool KeywordSearch(const wxString& keyword); + bool KeywordSearch(const wxString& keyword, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL); wxHtmlHelpFrame* GetFrame() { return m_helpFrame; } void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString); @@ -57,7 +59,7 @@ public: virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); } virtual bool Initialize(const wxString& file); virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} - virtual bool LoadFile(const wxString& file = ""); + virtual bool LoadFile(const wxString& file = wxT("")); virtual bool DisplaySection(int sectionNo); virtual bool DisplaySection(const wxString& section) { return Display(section); } virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); } @@ -98,6 +100,8 @@ protected: wxString m_titleFormat; int m_FrameStyle; // DECLARE_EVENT_TABLE() + + DECLARE_NO_COPY_CLASS(wxHtmlHelpController) }; #endif // wxUSE_WXHTML_HELP