diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 059333bd05..a836a4080d 100644
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -46,6 +46,8 @@ 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);
@@ -115,6 +117,8 @@ public:
wxWindow* FindTopLevelWindow();
protected:
+ void Init(int style);
+
virtual wxWindow* CreateHelpWindow();
virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data);
virtual wxHtmlHelpDialog* CreateHelpDialog(wxHtmlHelpData *data);
diff --git a/interface/wx/html/helpctrl.h b/interface/wx/html/helpctrl.h
index aed23de6d3..9b221131c2 100644
--- a/interface/wx/html/helpctrl.h
+++ b/interface/wx/html/helpctrl.h
@@ -79,6 +79,8 @@ public:
*/
wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE,
wxWindow* parentWindow = NULL);
+ wxHtmlHelpController(wxWindow* parentWindow, int style = wxHF_DEFAULT_STYLE);
+
/**
Adds a book (i.e. a @ref overview_html_helpformats ".hhp file"; an HTML Help
diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 66c903a364..d3cd0cf50b 100644
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -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