allow specifying the style for wxHtmlHelpController used as fallback by wxBestHelpCon...

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

diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h
index 95b128084c3b6d22a6c75181e5649f3083e0ead0..b62979af4d0dc278ae11853e66f34e32788c18b5 100644 (file)
--- a/include/wx/msw/helpbest.h
+++ b/include/wx/msw/helpbest.h
@@ -20,9 +20,12 @@
 class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
 {
 public:
-    wxBestHelpController(wxWindow* parentWindow = NULL)
-        : wxHelpControllerBase( parentWindow ), m_helpControllerType( wxUseNone ),
-          m_helpController( NULL )
+    wxBestHelpController(wxWindow* parentWindow = NULL,
+                         int style = wxHF_DEFAULT_STYLE)
+        : wxHelpControllerBase(parentWindow),
+          m_helpControllerType(wxUseNone),
+          m_helpController(NULL),
+          m_style(style)
     {
     }
 
@@ -113,6 +116,7 @@ protected:
 
     HelpControllerType m_helpControllerType;
     wxHelpControllerBase* m_helpController;
+    int m_style;
 
     DECLARE_DYNAMIC_CLASS(wxBestHelpController)
     DECLARE_NO_COPY_CLASS(wxBestHelpController)

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index 3782a29354e8901a7c5f9b7ee603564a9e971017..3605ea3daccd5f09c89d86889511c452ba814a4d 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -51,7 +51,8 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     delete chm;
 
     // try wxHtmlHelpController
-    wxHtmlHelpController* html = new wxHtmlHelpController(wxHF_DEFAULT_STYLE, m_parentWindow);
+    wxHtmlHelpController *
+        html = new wxHtmlHelpController(m_style, m_parentWindow);
 
     m_helpControllerType = wxUseHtmlHelp;
     if( html->Initialize( GetValidFilename( filename ) ) )