// Created: 03/12/01
// RCS-ID: $Id$
// Copyright: (c) 2001 Ron Lee <ron@debian.org>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/hash.h"
#endif
#include "wx/filename.h" // for SplitPath()
+#include "wx/strconv.h"
#include "wx/dynload.h"
#include "wx/module.h"
#endif
}
- m_handle = dlopen(libname.c_str(), rtldFlags);
+ m_handle = dlopen(libname.fn_str(), rtldFlags);
#endif // __VMS || __DARWIN__ ?
#elif defined(HAVE_SHL_LOAD)
{
shlFlags |= BIND_IMMEDIATE;
}
- m_handle = shl_load(libname.c_str(), BIND_DEFERRED, 0);
+ m_handle = shl_load(libname.fn_str(), BIND_DEFERRED, 0);
#elif defined(__WINDOWS__)
m_handle = ::LoadLibrary(libname.c_str());
{
wxString msg(_("Failed to load shared library '%s'"));
#if defined(HAVE_DLERROR) && !defined(__EMX__)
- const wxChar *err = dlerror();
+
+#if wxUSE_UNICODE
+ wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
+ const wxChar *err = buffer;
+#else
+ const wxChar *err = dlerror();
+#endif
+
if( err )
wxLogError( msg, err );
#else
DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
- symbol = dlsym( m_handle, name.c_str() );
+ symbol = dlsym( m_handle, name.fn_str() );
#elif defined(HAVE_SHL_LOAD)
- if( shl_findsym( &m_handle, name.c_str(), TYPE_UNDEFINED, &symbol ) != 0 )
+ // use local variable since shl_findsym modifies the handle argument
+ // to indicate where the symbol was found (GD)
+ wxDllType the_handle = m_handle;
+ if( shl_findsym( &the_handle, name.fn_str(), TYPE_UNDEFINED, &symbol ) != 0 )
symbol = 0;
#elif defined(__WINDOWS__)
if ( !symbol )
{
- wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'"));
#if defined(HAVE_DLERROR) && !defined(__EMX__)
+
+#if wxUSE_UNICODE
+ wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
+ const wxChar *err = buffer;
+#else
const wxChar *err = dlerror();
+#endif
+
if( err )
{
- failed = TRUE;
- wxLogError( msg, err );
+ wxLogError(wxT("%s"), err);
}
#else
failed = TRUE;
// Hash all the class names into a local table too so
// we can quickly find the entry they correspond to.
-
- if( ms_classes->Get(info->m_className) == 0 )
- ms_classes->Put(info->m_className, (wxObject *) this);
+ (*ms_classes)[info->m_className] = this;
}
}
for(info = m_after; info != m_before; info = info->m_next)
{
wxClassInfo::sm_classTable->Delete(info->m_className);
- ms_classes->Delete(info->m_className);
+ ms_classes->erase(ms_classes->find(info->m_className));
}
if( wxClassInfo::sm_first == m_after )
wxASSERT_MSG( m_linkcount == 1,
_T("RegisterModules should only be called for the first load") );
- for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+ for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next)
{
if( info->IsKindOf(CLASSINFO(wxModule)) )
{
// FIXME: Likewise this is (well was) very similar to InitializeModules()
- for(wxModuleList::Node *node = m_wxmodules.GetFirst(); node; node->GetNext())
+ for ( wxModuleList::Node *node = m_wxmodules.GetFirst();
+ node;
+ node = node->GetNext())
{
if( !node->GetData()->Init() )
{
{
wxModuleList::Node *node;
- for(node = m_wxmodules.GetFirst(); node; node->GetNext())
+ for ( node = m_wxmodules.GetFirst(); node; node = node->GetNext() )
node->GetData()->Exit();
- for(node = m_wxmodules.GetFirst(); node; node->GetNext())
+ for ( node = m_wxmodules.GetFirst(); node; node = node->GetNext() )
wxModule::UnregisterModule( node->GetData() );
m_wxmodules.DeleteContents(TRUE);
}
else
{
- entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+ entry = FindByName(realname);
}
if ( entry )
if ( entry->IsLoaded() )
{
- ms_manifest->Put(realname, (wxObject*) entry);
+ (*ms_manifest)[realname] = entry;
wxLogTrace(_T("dll"),
_T("LoadLibrary(%s): loaded ok."), realname.c_str());
{
wxString realname = libname;
- wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+ wxPluginLibrary *entry = FindByName(realname);
if ( !entry )
{
realname += wxDynamicLibrary::GetDllExt();
- entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+ entry = FindByName(realname);
}
if ( !entry )
return FALSE;
}
- ms_manifest->Delete(realname);
+ ms_manifest->erase(ms_manifest->find(realname));
return TRUE;
}
#if WXWIN_COMPATIBILITY_2_2
wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
{
- wxNode *node;
- ms_manifest->BeginFind();
+ for ( wxDLManifest::iterator i = ms_manifest->begin();
+ i != ms_manifest->end();
+ ++i )
+ {
+ wxPluginLibrary * const lib = i->second;
- for(node = ms_manifest->Next(); node; node = ms_manifest->Next())
- if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle )
- return (wxPluginLibrary*)node->GetData();
+ if ( lib->GetLibHandle() == handle )
+ return lib;
+ }
return NULL;
}
bool wxPluginManager::Load(const wxString &libname, int flags)
{
m_entry = wxPluginManager::LoadLibrary(libname, flags);
+
return IsLoaded();
}
void wxPluginManager::Unload()
{
- wxNode *node;
- ms_manifest->BeginFind();
-
- // It's either this or store the name of the lib just to do this.
+ wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
- for(node = ms_manifest->Next(); node; node = ms_manifest->Next())
- if( (wxPluginLibrary*)node->GetData() == m_entry )
- break;
-
- if( m_entry && m_entry->UnrefLib() )
+ for ( wxDLManifest::iterator i = ms_manifest->begin();
+ i != ms_manifest->end();
+ ++i )
{
- delete node;
- m_entry = 0;
+ if ( i->second == m_entry )
+ {
+ ms_manifest->erase(i);
+ break;
+ }
}
+
+ m_entry->UnrefLib();
+
+ m_entry = NULL;
}
// ---------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2
-wxDllType wxDllLoader::LoadLibrary(const wxString &name)
+wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success)
{
wxPluginLibrary *p = wxPluginManager::LoadLibrary
(
wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
);
+ if ( success )
+ *success = p != NULL;
+
return p ? p->GetLibHandle() : 0;
}
projects / wxWidgets.git / blobdiff