X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd45b3e1766beb235778b76c7d8fe85ed36076c3..25db2c25bc488fcdd10cc5d2fd4938fd78b1cf0e:/src/html/helpctrl.cpp?ds=inline diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp index faad6fb6e0..af46650fa4 100644 --- a/src/html/helpctrl.cpp +++ b/src/html/helpctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpctrl.cpp +// Name: src/html/helpctrl.cpp // Purpose: wxHtmlHelpController // Notes: Based on htmlhelp.cpp, implementing a monolithic // HTML Help controller class, by Vaclav Slavik @@ -42,6 +42,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase) wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow): wxHelpControllerBase(parentWindow) +{ + Init(style); +} + +wxHtmlHelpController::wxHtmlHelpController(wxWindow* parentWindow, int style): + wxHelpControllerBase(parentWindow) +{ + Init(style); +} + +void wxHtmlHelpController::Init(int style) { m_helpWindow = NULL; m_helpFrame = NULL; @@ -55,6 +66,7 @@ wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow): m_shouldPreventAppExit = false; } + wxHtmlHelpController::~wxHtmlHelpController() { #if wxUSE_CONFIG @@ -329,12 +341,12 @@ void wxHtmlHelpController::SetHelpWindow(wxHtmlHelpWindow* helpWindow) helpWindow->SetController(this); } -void wxHtmlHelpController::SetFrameParameters(const wxString& title, +void wxHtmlHelpController::SetFrameParameters(const wxString& titleFormat, const wxSize& size, const wxPoint& pos, bool WXUNUSED(newFrameEachTime)) { - SetTitleFormat(title); + SetTitleFormat(titleFormat); wxHtmlHelpFrame* frame = wxDynamicCast(FindTopLevelWindow(), wxHtmlHelpFrame); wxHtmlHelpDialog* dialog = wxDynamicCast(FindTopLevelWindow(), wxHtmlHelpDialog); if (frame)