use wxColourDatabase::Find() instead of deprecated FindColour(); some minor code...

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

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 20e0bbc27e6775ec650b646f993f9c7627f3c100..7ad636774742bba39206a70e10912ec4e8d11584 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "helpchm.h"
 #endif
 
     #pragma implementation "helpchm.h"
 #endif
 


@@ -25,7 +25,7 @@
 #include "wx/filefn.h"
 #include "wx/msw/helpchm.h"
 
 #include "wx/filefn.h"
 #include "wx/msw/helpchm.h"
 

-#include "wx/dynlib.h"
+#include "wx/dynload.h"

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"


@@ -42,10 +42,10 @@
 
 #ifndef UNICODE
     typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );
 
 #ifndef UNICODE
     typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );

-    #define HTMLHELP_NAME "HtmlHelpA"
+    #define HTMLHELP_NAME wxT("HtmlHelpA")

 #else // ANSI
     typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );
 #else // ANSI
     typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );

-    #define HTMLHELP_NAME "HtmlHelpW"
+    #define HTMLHELP_NAME wxT("HtmlHelpW")

 #endif
 
 // dll symbol handle
 #endif
 
 // dll symbol handle


@@ -80,9 +80,8 @@ static void UnloadHtmlHelpLibrary()
 {
     if ( gs_htmlHelp )
     {
 {
     if ( gs_htmlHelp )
     {

-        wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );
-
-        gs_htmlHelp = 0;
+        if (wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") ))
+            gs_htmlHelp = 0;

     }
 }
 
     }
 }
 


@@ -198,7 +197,8 @@ bool wxCHMHelpController::DisplayBlock(long block)
     return DisplaySection(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;
 
 {
     if (m_helpFile.IsEmpty()) return FALSE;