X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..961dd75341aaa5083098fefd5c1074d8308b5732:/include/wx/msw/helpwin.h diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index c3260a6e38..da2c7c2fd4 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -12,7 +12,7 @@ #ifndef _WX_HELPWIN_H_ #define _WX_HELPWIN_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "helpwin.h" #endif @@ -32,13 +32,17 @@ 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); virtual bool DisplayContents(); virtual bool DisplaySection(int sectionNo); + virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); } virtual bool DisplayBlock(long blockNo); - virtual bool KeywordSearch(const wxString& k); + virtual bool DisplayContextPopup(int contextId); + virtual bool KeywordSearch(const wxString& k, + wxHelpSearchMode mode = wxHELP_SEARCH_ALL); virtual bool Quit(); inline wxString GetHelpFile() const { return m_helpFile; }