Add a ctor that is compatible with the documented wxHelpController API

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 059333bd05f3437a860a2fd69c5897ccb3f21eed..a836a4080dabe4745425035e868c8185d877c03d 100644 (file)
--- 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 aed23de6d38272c0010dc092a7988f9696650b9c..9b221131c28183b71929ab47abe91e939c9d39e4 100644 (file)
--- 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 66c903a364520b7f73162340cbdb998d80d4eaa9..d3cd0cf50b9bc954e6b8d04b8dc05e7e84de3d29 100644 (file)
--- 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