[this message is for the previous commit as well]

1. <htmlhelp.h> is not required any more
2. fixed memory leak

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 88dff23aab0bda1c4e7f2a596592199340925fce..4f26427f28915dfabb734df23a02774cf18b8b1d 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -101,26 +101,25 @@ struct HH_AKLINK
 
 // dll symbol handle
 static HTMLHELP gs_htmlHelp = 0;
 
 // dll symbol handle
 static HTMLHELP gs_htmlHelp = 0;

-static wxPluginLibrary *gs_libHtmlHelp = NULL;

 
 static bool LoadHtmlHelpLibrary()
 {
 
 static bool LoadHtmlHelpLibrary()
 {

-    gs_libHtmlHelp = wxPluginManager::LoadLibrary( _T("HHCTRL.OCX"), wxDL_DEFAULT | wxDL_VERBATIM );
+    wxPluginLibrary *lib = wxPluginManager::LoadLibrary( _T("HHCTRL.OCX"), wxDL_DEFAULT | wxDL_VERBATIM );

 
 

-    if( !gs_libHtmlHelp )
+    if( !lib )

     {
         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
     {
     {
         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_htmlHelp = (HTMLHELP)gs_libHtmlHelp->GetSymbol( HTMLHELP_NAME );
+        gs_htmlHelp = (HTMLHELP)lib->GetSymbol( HTMLHELP_NAME );

 
         if( !gs_htmlHelp )
         {
             wxLogError(_("Failed to initialize MS HTML Help."));
 
 
         if( !gs_htmlHelp )
         {
             wxLogError(_("Failed to initialize MS HTML Help."));
 

-            gs_libHtmlHelp->UnrefLib();
+            lib->UnrefLib();

             return FALSE ;
         }
     }
             return FALSE ;
         }
     }


@@ -130,10 +129,9 @@ static bool LoadHtmlHelpLibrary()
 
 static void UnloadHtmlHelpLibrary()
 {
 
 static void UnloadHtmlHelpLibrary()
 {

-    if( gs_htmlHelp )
+    if ( gs_htmlHelp )

     {
         wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );
     {
         wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );

-        gs_libHtmlHelp->UnrefLib();

 
         gs_htmlHelp = 0;
     }
 
         gs_htmlHelp = 0;
     }