X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/638a0b2c729a7894735e4167dca971032409ffe6..4e89ceb11ee28f55050dfc03c69e72cd84f98cdf:/src/msw/helpchm.cpp?ds=inline

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index b730931d20..4a6148671f 100644
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -6,7 +6,7 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -28,8 +28,9 @@
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__)
 #include "wx/msw/helpchm.h"
+
 #include "wx/dynlib.h"
- 
+
 #ifndef WX_PRECOMP
 #include <windows.h>
 #endif
@@ -55,41 +56,29 @@ typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );
 typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );
 #define HTMLHELP_NAME "HtmlHelpW"
 #endif
-// dll handle/reference count
+// dll symbol handle
 static HTMLHELP gs_htmlHelp = 0;
-static wxDllType gs_dllHandle = 0;
-static int gs_dllCount = 0;
 
 static bool LoadHtmlHelpLibrary()
 {
-    if( !gs_dllCount )
-    {
-        gs_dllHandle = wxDllLoader::LoadLibrary( "hhctrl.ocx" );
-        if( !gs_dllHandle )
-        {
-            wxLogError(_("MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."));
-            return FALSE;
-        }
-        else
-        {
-            gs_dllCount = 1;
-            gs_htmlHelp = (HTMLHELP)wxDllLoader::GetSymbol( gs_dllHandle, HTMLHELP_NAME );
-
-            if( !gs_htmlHelp )
-            {
-                wxLogError(_("Failed to initialize MS HTML Help."));
-
-                wxDllLoader::UnloadLibrary(gs_dllHandle);
-                gs_dllHandle = 0;
-                gs_dllCount = 0;
+    wxPluginLibrary *lib = wxPluginManager::LoadLibrary( _T("HHCTRL.OCX"), wxDL_DEFAULT | wxDL_VERBATIM );
 
-                return FALSE ;
-            }
-        }
+    if( !lib->IsLoaded() )
+    {
+        wxLogError(_("MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."));
+        return FALSE;
     }
     else
     {
-        ++gs_dllCount;
+        gs_htmlHelp = (HTMLHELP)lib->GetSymbol( HTMLHELP_NAME );
+
+        if( !gs_htmlHelp )
+        {
+            wxLogError(_("Failed to initialize MS HTML Help."));
+
+            lib->UnrefLib();
+            return FALSE ;
+        }
     }
 
     return TRUE;
@@ -97,10 +86,9 @@ static bool LoadHtmlHelpLibrary()
 
 static void UnloadHtmlHelpLibrary()
 {
-    if( gs_dllCount != 0 && !--gs_dllCount )
+    if( gs_htmlHelp )
     {
-        wxDllLoader::UnloadLibrary( gs_dllHandle );
-        gs_dllHandle = 0;
+        wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );
         gs_htmlHelp = 0;
     }
 }
@@ -185,8 +173,8 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
     popup.idString = contextId ;
 
     GetCursorPos(& popup.pt);
-    popup.clrForeground = -1;
-    popup.clrBackground = -1;
+    popup.clrForeground = (COLORREF)-1;
+    popup.clrBackground = (COLORREF)-1;
     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = NULL;
@@ -202,8 +190,8 @@ bool wxCHMHelpController::DisplayTextPopup(const wxString& text, const wxPoint&
     popup.hinst = (HINSTANCE) wxGetInstance();
     popup.idString = 0 ;
     popup.pt.x = pos.x; popup.pt.y = pos.y;
-    popup.clrForeground = -1;
-    popup.clrBackground = -1;
+    popup.clrForeground = (COLORREF)-1;
+    popup.clrBackground = (COLORREF)-1;
     popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
     popup.pszFont = NULL;
     popup.pszText = (const wxChar*) text;
@@ -262,3 +250,5 @@ wxString wxCHMHelpController::GetValidFilename(const wxString& file) const
 }
 
 #endif // wxUSE_HELP
+
+// vi:sts=4:sw=4:et