X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3295e23873ab52d5be80c52b8647909546936ae2..0c05fdf3570e8066b8a9a16627562e544306a678:/include/wx/msw/helpchm.h diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index 776902520c..09c621b5f3 100644 --- a/include/wx/msw/helpchm.h +++ b/include/wx/msw/helpchm.h @@ -12,7 +12,7 @@ #ifndef _WX_HELPCHM_H_ #define _WX_HELPCHM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "helpchm.h" #endif @@ -28,6 +28,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); @@ -37,7 +38,8 @@ public: virtual bool DisplayBlock(long blockNo); virtual bool DisplayContextPopup(int contextId); virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); - virtual bool KeywordSearch(const wxString& k); + virtual bool KeywordSearch(const wxString& k, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL); virtual bool Quit(); wxString GetHelpFile() const { return m_helpFile; }