X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..a6cb8040a8f73935791c44b8f1b8ac4711cb84f6:/include/wx/msw/helpbest.h diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index c5a6d72f7e..95b128084c 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,19 +12,16 @@ #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__) && wxUSE_WXHTML_HELP +#if wxUSE_HELP && wxUSE_MS_HTML_HELP \ + && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__) #include "wx/helpbase.h" class WXDLLIMPEXP_HTML wxBestHelpController: public wxHelpControllerBase { public: - wxBestHelpController() - : m_helpControllerType( wxUseNone ), + wxBestHelpController(wxWindow* parentWindow = NULL) + : wxHelpControllerBase( parentWindow ), m_helpControllerType( wxUseNone ), m_helpController( NULL ) { } @@ -33,6 +30,7 @@ public: // Must call this to set the filename virtual bool Initialize(const wxString& file); + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } // If file is "", reloads file given in Initialize virtual bool LoadFile(const wxString& file = wxEmptyString) @@ -70,9 +68,10 @@ public: return m_helpController->DisplayTextPopup( text, pos ); } - virtual bool KeywordSearch(const wxString& k) + virtual bool KeywordSearch(const wxString& k, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL) { - return m_helpController->KeywordSearch( k ); + return m_helpController->KeywordSearch( k, mode ); } virtual bool Quit() @@ -84,7 +83,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 ); @@ -99,6 +98,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; @@ -113,7 +118,7 @@ protected: 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_