X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3db5226517a63bcdc983e638f1a312764fe1312f..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/helpbest.h?ds=sidebyside diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index a05c4e14de..3552d9d5aa 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpbest.h +// Name: wx/msw/helpbest.h // Purpose: Tries to load MS HTML Help, falls back to wxHTML upon failure // Author: Mattia Barbon // Modified by: @@ -12,17 +12,21 @@ #ifndef _WX_HELPBEST_H_ #define _WX_HELPBEST_H_ -#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \ +#if wxUSE_HELP && wxUSE_MS_HTML_HELP \ && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) #include "wx/helpbase.h" +#include "wx/html/helpfrm.h" // for wxHF_DEFAULT_STYLE 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,12 +117,13 @@ protected: HelpControllerType m_helpControllerType; wxHelpControllerBase* m_helpController; + int m_style; DECLARE_DYNAMIC_CLASS(wxBestHelpController) DECLARE_NO_COPY_CLASS(wxBestHelpController) }; -#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP +#endif // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP #endif // _WX_HELPBEST_H_