// Created: 16/04/2000
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "helpchm.h"
+ #pragma implementation "helpchm.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#endif
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__)
#include "wx/filefn.h"
-
-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__)
#include "wx/msw/helpchm.h"
-#if wxUSE_DYNAMIC_LOADER || wxUSE_DYNLIB_CLASS
#include "wx/dynlib.h"
-#endif
#ifndef WX_PRECOMP
-#include <windows.h>
+ #include "wx/intl.h"
+ #include "wx/app.h"
#endif
-// This is found in the HTML Help Workshop installation,
-// along with htmlhelp.lib.
-#include <htmlhelp.h>
-
-#include <time.h>
-
-#ifdef __WXMSW__
#include "wx/msw/private.h"
-#endif
-
-#include <string.h>
+#include "wx/msw/missing.h"
+// ----------------------------------------------------------------------------
// utility functions to manage the loading/unloading
// of hhctrl.ocx
+// ----------------------------------------------------------------------------
+
#ifndef UNICODE
-typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );
-#define HTMLHELP_NAME "HtmlHelpA"
-#else
-typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );
-#define HTMLHELP_NAME "HtmlHelpW"
+ typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );
+ #define HTMLHELP_NAME wxT("HtmlHelpA")
+#else // ANSI
+ typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );
+ #define HTMLHELP_NAME wxT("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 );
+ wxPluginLibrary *lib = wxPluginManager::LoadLibrary( _T("HHCTRL.OCX"), wxDL_DEFAULT | wxDL_VERBATIM );
- if( !gs_htmlHelp )
- {
- wxLogError(_("Failed to initialize MS HTML Help."));
-
- wxDllLoader::UnloadLibrary(gs_dllHandle);
- gs_dllHandle = 0;
- gs_dllCount = 0;
-
- return FALSE ;
- }
- }
+ 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
{
- ++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;
static void UnloadHtmlHelpLibrary()
{
- if( gs_dllCount != 0 && !--gs_dllCount )
+ if ( gs_htmlHelp )
{
- wxDllLoader::UnloadLibrary( gs_dllHandle );
- gs_dllHandle = 0;
- gs_htmlHelp = 0;
+ if (wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") ))
+ gs_htmlHelp = 0;
}
}
wxString str = GetValidFilename(m_helpFile);
- gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_HELP_FINDER, 0L);
+ gs_htmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_DISPLAY_TOPIC, 0L);
return TRUE;
}
bool wxCHMHelpController::Quit()
{
gs_htmlHelp(GetSuitableHWND(), 0, HH_CLOSE_ALL, 0L);
- UnloadHtmlHelpLibrary();
return TRUE;
}
return fullName;
}
+wxCHMHelpController::~wxCHMHelpController()
+{
+ UnloadHtmlHelpLibrary();
+}
+
#endif // wxUSE_HELP
+