Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow specifying the style for wxHtmlHelpController used as fallback by wxBestHelpController (patch 1485669)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-05-28 23:07:02 +00:00
parent a552d1201f
commit 1c756ac814
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/helpbest.h
View File

@@ -20,9 +20,12 @@
class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase
{ {
public: public:
wxBestHelpController(wxWindow* parentWindow = NULL) wxBestHelpController(wxWindow* parentWindow = NULL,
: wxHelpControllerBase( parentWindow ), m_helpControllerType( wxUseNone ), int style = wxHF_DEFAULT_STYLE)
m_helpController( NULL ) : wxHelpControllerBase(parentWindow),
m_helpControllerType(wxUseNone),
m_helpController(NULL),
m_style(style)
{ {
} }
@@ -113,6 +116,7 @@ protected:
HelpControllerType m_helpControllerType; HelpControllerType m_helpControllerType;
wxHelpControllerBase* m_helpController; wxHelpControllerBase* m_helpController;
int m_style;
DECLARE_DYNAMIC_CLASS(wxBestHelpController) DECLARE_DYNAMIC_CLASS(wxBestHelpController)
DECLARE_NO_COPY_CLASS(wxBestHelpController) DECLARE_NO_COPY_CLASS(wxBestHelpController)

3
src/msw/helpbest.cpp
View File

@@ -51,7 +51,8 @@ bool wxBestHelpController::Initialize( const wxString& filename )
delete chm; delete chm;
// try wxHtmlHelpController // try wxHtmlHelpController
wxHtmlHelpController* html = new wxHtmlHelpController(wxHF_DEFAULT_STYLE, m_parentWindow); wxHtmlHelpController *
html = new wxHtmlHelpController(m_style, m_parentWindow);
m_helpControllerType = wxUseHtmlHelp; m_helpControllerType = wxUseHtmlHelp;
if( html->Initialize( GetValidFilename( filename ) ) ) if( html->Initialize( GetValidFilename( filename ) ) )