X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6acba9a7194b30113636efb08e0b165f91011e79..ae54422d9d02ebd0a244998ef9117beff1432268:/include/wx/msw/helpbest.h diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index 0169e06262..003f100e8e 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -12,7 +12,7 @@ #ifndef _WX_HELPBEST_H_ #define _WX_HELPBEST_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "helpbest.h" #endif @@ -33,6 +33,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 +71,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()