X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65afac3fbc6115b899045d767af823fc3abd7322..be33a1c72620aad7a221896b24b7f75fe79dbdc5:/include/wx/html/helpfrm.h?ds=sidebyside diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index fa3c26e609..4c53f11e40 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -74,10 +74,12 @@ public: wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); } wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); + int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL, + wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE); - ~wxHtmlHelpFrame(); + int style = wxHF_DEFAULT_STYLE, + wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString); + virtual ~wxHtmlHelpFrame(); /// Returns the data associated with the window. wxHtmlHelpData* GetData() { return m_Data; } @@ -105,11 +107,11 @@ public: // Override to add custom buttons to the toolbar virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}; -protected: // we don't want to prevent the app from closing just because a help window // remains opened - virtual bool ShouldPreventAppExit() const { return false; } + virtual bool ShouldPreventAppExit() const; +protected: void Init(wxHtmlHelpData* data = NULL); void OnCloseWindow(wxCloseEvent& event);