From caaff22c06e64341fa8b9057846983cce50b9ec9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 Nov 2002 21:03:02 +0000 Subject: [PATCH] replaced type unsafe wxHash with hash_map<> git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dynload.h | 26 ++++++++++++-------- src/common/dynload.cpp | 55 +++++++++++++++++++++++------------------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/include/wx/dynload.h b/include/wx/dynload.h index 11462250d6..a1c19d73a9 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -25,7 +25,7 @@ #if wxUSE_DYNAMIC_LOADER -#include "wx/hash.h" +#include "wx/hashmap.h" #include "wx/module.h" // FIXME: can this go in private.h or something too?? @@ -38,11 +38,10 @@ #include "wx/msw/private.h" #endif -// Ugh, I'd much rather this was typesafe, but no time -// to rewrite wxHashTable right now.. +class WXDLLEXPORT wxPluginLibrary; -typedef wxHashTable wxDLManifest; -typedef wxHashTable wxDLImports; +WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxPluginLibrary *, wxDLManifest); +typedef wxDLManifest wxDLImports; // ---------------------------------------------------------------------------- // conditional compilation @@ -168,7 +167,7 @@ protected: // no copy ctor/assignment operators // or we'd try to unload the library twice -DECLARE_NO_COPY_CLASS(wxDynamicLibrary) + DECLARE_NO_COPY_CLASS(wxDynamicLibrary) }; @@ -234,7 +233,7 @@ private: void RegisterModules(); // Init any wxModules in the lib. void UnregisterModules(); // Cleanup any wxModules we installed. -DECLARE_NO_COPY_CLASS(wxPluginLibrary) + DECLARE_NO_COPY_CLASS(wxPluginLibrary) }; @@ -257,7 +256,7 @@ public: // Instance methods. - wxPluginManager() : m_entry(0) {}; + wxPluginManager() : m_entry(NULL) {}; wxPluginManager(const wxString &libname, int flags = wxDL_DEFAULT) { Load(libname, flags); @@ -277,14 +276,21 @@ public: static void ClearManifest() { delete ms_manifest; ms_manifest = NULL; } private: + // return the pointer to the entry for the library with given name in + // ms_manifest or NULL if none + static wxPluginLibrary *FindByName(const wxString& name) + { + const wxDLManifest::iterator i = ms_manifest->find(name); + + return i == ms_manifest->end() ? NULL : i->second; + } static wxDLManifest* ms_manifest; // Static hash of loaded libs. wxPluginLibrary* m_entry; // Cache our entry in the manifest. // We could allow this class to be copied if we really // wanted to, but not without modification. - -DECLARE_NO_COPY_CLASS(wxPluginManager) + DECLARE_NO_COPY_CLASS(wxPluginManager) }; diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index aa917ba051..3ab734eafc 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -33,6 +33,7 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/intl.h" + #include "wx/hash.h" #endif #include "wx/filename.h" // for SplitPath() @@ -416,9 +417,7 @@ void wxPluginLibrary::UpdateClassInfo() // 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; } } @@ -438,7 +437,7 @@ void wxPluginLibrary::RestoreClassInfo() 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 ) @@ -549,7 +548,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) } else { - entry = (wxPluginLibrary*) ms_manifest->Get(realname); + entry = FindByName(realname); } if ( entry ) @@ -565,7 +564,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) if ( entry->IsLoaded() ) { - ms_manifest->Put(realname, (wxObject*) entry); + (*ms_manifest)[realname] = entry; wxLogTrace(_T("dll"), _T("LoadLibrary(%s): loaded ok."), realname.c_str()); @@ -594,13 +593,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) { 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 ) @@ -619,7 +618,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) return FALSE; } - ms_manifest->Delete(realname); + ms_manifest->erase(ms_manifest->find(realname)); return TRUE; } @@ -627,12 +626,15 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) #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; } @@ -645,25 +647,28 @@ wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle) bool wxPluginManager::Load(const wxString &libname, int flags) { m_entry = wxPluginManager::LoadLibrary(libname, flags); + return IsLoaded(); } void wxPluginManager::Unload() { - wxNode *node; - ms_manifest->BeginFind(); + wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") ); - // It's either this or store the name of the lib just to do this. - - 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); + return; + } } + + m_entry->UnrefLib(); + + m_entry = NULL; } // ---------------------------------------------------------------------------