]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/helpchm.cpp
Do archive name case conversion for wxMac and wxMotif
[wxWidgets.git] / src / msw / helpchm.cpp
index 2871a9f78265dbdcdf7d598f4d6d64c7c7e3fe13..902829aca03321c310f11ab131f96dc961d1f637 100644 (file)
@@ -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"
@@ -80,9 +80,8 @@ static void UnloadHtmlHelpLibrary()
 {
     if ( gs_htmlHelp )
     {
-        wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );
-
-        gs_htmlHelp = 0;
+        if (wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") ))
+            gs_htmlHelp = 0;
     }
 }