X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62cdd7d3f80a9a5ef48041695008bbdbf319e9c2..6041f69ca7bbb7c39e4ba64e407bc3ac39e3687f:/include/wx/msw/helpbest.h diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index 5c735c65d9..d5f78ffb5f 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,21 +12,21 @@ #ifndef _WX_HELPBEST_H_ #define _WX_HELPBEST_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "helpbest.h" -#endif - -#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() - : 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) { } @@ -87,7 +87,7 @@ public: virtual void SetFrameParameters(const wxString& title, const wxSize& size, const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = FALSE) + bool newFrameEachTime = false) { m_helpController->SetFrameParameters( title, size, pos, newFrameEachTime ); @@ -102,6 +102,12 @@ public: newFrameEachTime ); } + /// Set the window that can optionally be used for the help window's parent. + virtual void SetParentWindow(wxWindow* win) { m_helpController->SetParentWindow(win); } + + /// Get the window that can optionally be used for the help window's parent. + virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); } + protected: // Append/change extension if necessary. wxString GetValidFilename(const wxString& file) const; @@ -111,12 +117,13 @@ protected: HelpControllerType m_helpControllerType; wxHelpControllerBase* m_helpController; + int m_style; DECLARE_DYNAMIC_CLASS(wxBestHelpController) - DECLARE_NO_COPY_CLASS(wxBestHelpController) + wxDECLARE_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_