Removed code duplication introduced during wxUniv merge in 1.132

[wxWidgets.git] / src / msw / helpchm.cpp

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index cf90de12e9d5d94d44e3e58690e60cb25ca8dc91..7ad636774742bba39206a70e10912ec4e8d11584 100644 (file)
--- 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;