possible fix for SF bug #1186144 (only VC tested)

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

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 7a5f3cb6f9e01c4fc3ecf9713e0deb913c5d7170..3f05606e8dc80351b5f01321b6b95581cbf027d6 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -79,7 +79,7 @@ static bool LoadHtmlHelpLibrary()
 static void UnloadHtmlHelpLibrary()
 {
     if ( gs_htmlHelp )
 static void UnloadHtmlHelpLibrary()
 {
     if ( gs_htmlHelp )

-    {
+    {          

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


@@ -243,6 +243,7 @@ wxString wxCHMHelpController::GetValidFilename(const wxString& file) const
 
 wxCHMHelpController::~wxCHMHelpController()
 {
 
 wxCHMHelpController::~wxCHMHelpController()
 {

+       gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);

     UnloadHtmlHelpLibrary();
 }
 
     UnloadHtmlHelpLibrary();
 }