Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[this message is for the previous commit as well]

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2002-03-09 22:46:20 +00:00
parent 771c7b4a4b
commit cd560c961a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/msw/helpchm.cpp
View File

@@ -101,26 +101,25 @@ struct HH_AKLINK
// dll symbol handle // dll symbol handle
static HTMLHELP gs_htmlHelp = 0; 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.")); wxLogError(_("MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."));
return FALSE; return FALSE;
} }
else else
{ {
gs_htmlHelp = (HTMLHELP)gs_libHtmlHelp->GetSymbol( HTMLHELP_NAME ); gs_htmlHelp = (HTMLHELP)lib->GetSymbol( HTMLHELP_NAME );
if( !gs_htmlHelp ) if( !gs_htmlHelp )
{ {
wxLogError(_("Failed to initialize MS HTML Help.")); 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;
} }