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

removed dependency on windows.h from dynload.h

Browse Source 
Moved dlopen implementation into wxDynamicLibrary.
Wrapped wxDllLoader in 2.2 compat guards and defined it in terms
of the new classes.
Added link option flags to wxDL and other missing functionality
previously implemented in wxDllLoader.
Modified wxDL++ classes to use wxDL base class implementation.
Replaced all uses of wxDllLoader in wx classes by the new
classes as appropriate.

def'd out (unimplemented) wxSystemSettingsBase so wxMSW would link.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-12-29 14:50:36 +00:00
parent 7d9d1fd708
commit 4f89dbc48e
8 changed files with 549 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/msw/helpchm.cpp
View File

@@ -6,7 +6,7 @@
// Created: 16/04/2000
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -56,41 +56,29 @@ typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCSTR, UINT, DWORD );
typedef HWND ( WINAPI * HTMLHELP )( HWND, LPCWSTR, UINT, DWORD );
#define HTMLHELP_NAME "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 )
wxPluginLibrary *lib = wxPluginManager::LoadLibrary( _T("HHCTRL.OCX"), wxDL_DEFAULT | wxDL_VERBATIM );
if( !lib->IsLoaded() )
{
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 );
if( !gs_htmlHelp )
{
wxLogError(_("Failed to initialize MS HTML Help."));
wxDllLoader::UnloadLibrary(gs_dllHandle);
gs_dllHandle = 0;
gs_dllCount = 0;
return FALSE ;
}
}
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;
@@ -98,10 +86,9 @@ static bool LoadHtmlHelpLibrary()
static void UnloadHtmlHelpLibrary()
{
if( gs_dllCount != 0 && !--gs_dllCount )
if( gs_htmlHelp )
{
wxDllLoader::UnloadLibrary( gs_dllHandle );
gs_dllHandle = 0;
wxPluginManager::UnloadLibrary( _T("HHCTRL.OCX") );
gs_htmlHelp = 0;
}
}
@@ -263,3 +250,5 @@ wxString wxCHMHelpController::GetValidFilename(const wxString& file) const
}
#endif // wxUSE_HELP
// vi:sts=4:sw=4:et