X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be9536aaaa160cc4d8e8acfc26d5c39ca2f57be..4b1ae1539c549eb612e5d2b6876124138ce9cb4e:/src/msw/helpchm.cpp?ds=sidebyside diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp index cf90de12e9..7ad6367747 100644 --- a/src/msw/helpchm.cpp +++ b/src/msw/helpchm.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "helpchm.h" #endif @@ -25,7 +25,7 @@ #include "wx/filefn.h" #include "wx/msw/helpchm.h" -#include "wx/dynlib.h" +#include "wx/dynload.h" #ifndef WX_PRECOMP #include "wx/intl.h" @@ -197,7 +197,8 @@ bool wxCHMHelpController::DisplayBlock(long block) return DisplaySection(block); } -bool wxCHMHelpController::KeywordSearch(const wxString& k) +bool wxCHMHelpController::KeywordSearch(const wxString& k, + wxHelpSearchMode WXUNUSED(mode)) { if (m_helpFile.IsEmpty()) return FALSE;