X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/html/helpctrl.h?ds=sidebyside diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h index 15328a0ad1..856c9d2c35 100644 --- a/include/wx/html/helpctrl.h +++ b/include/wx/html/helpctrl.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpctrl.h +// Name: wx/html/helpctrl.h // Purpose: wxHtmlHelpController // Notes: Based on htmlhelp.cpp, implementing a monolithic // HTML Help controller class, by Vaclav Slavik @@ -46,8 +46,12 @@ class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxE public: wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL); + wxHtmlHelpController(wxWindow* parentWindow, int style = wxHF_DEFAULT_STYLE); + virtual ~wxHtmlHelpController(); + void SetShouldPreventAppExit(bool enable); + void SetTitleFormat(const wxString& format); void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); } bool AddBook(const wxString& book_url, bool show_wait_msg = false); @@ -66,6 +70,7 @@ public: wxHtmlHelpFrame* GetFrame() { return m_helpFrame; } wxHtmlHelpDialog* GetDialog() { return m_helpDialog; } +#if wxUSE_CONFIG void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString); // Assigns config object to the Ctrl. This config is then @@ -73,6 +78,7 @@ public: // Ctrl and it's wxHtmlWindow virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); +#endif // wxUSE_CONFIG //// Backward compatibility with wxHelpController API @@ -85,7 +91,7 @@ public: virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); } virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); - virtual void SetFrameParameters(const wxString& title, + virtual void SetFrameParameters(const wxString& titleFormat, const wxSize& size, const wxPoint& pos = wxDefaultPosition, bool newFrameEachTime = false); @@ -111,6 +117,8 @@ public: wxWindow* FindTopLevelWindow(); protected: + void Init(int style); + virtual wxWindow* CreateHelpWindow(); virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data); virtual wxHtmlHelpDialog* CreateHelpDialog(wxHtmlHelpData *data); @@ -118,14 +126,18 @@ protected: wxHtmlHelpData m_helpData; wxHtmlHelpWindow* m_helpWindow; +#if wxUSE_CONFIG wxConfigBase * m_Config; wxString m_ConfigRoot; +#endif // wxUSE_CONFIG wxString m_titleFormat; int m_FrameStyle; wxHtmlHelpFrame* m_helpFrame; wxHtmlHelpDialog* m_helpDialog; - DECLARE_NO_COPY_CLASS(wxHtmlHelpController) + bool m_shouldPreventAppExit; + + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController); }; /*