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

@@ -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
+class WXDLLEXPORT wxPluginLibrary;
-// to rewrite wxHashTable right now..
 
-typedef wxHashTable wxDLManifest;
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxPluginLibrary *, wxDLManifest);
-typedef wxHashTable wxDLImports;
+typedef wxDLManifest wxDLImports;
 
 // ----------------------------------------------------------------------------
 // conditional compilation
@@ -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,13 +276,20 @@ 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)
 };
 

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.
-
+            (*ms_classes)[info->m_className] = this;
-            if( ms_classes->Get(info->m_className) == 0 )
-                ms_classes->Put(info->m_className, (wxObject *) 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;
+    for ( wxDLManifest::iterator i = ms_manifest->begin();
-    ms_manifest->BeginFind();
+          i != ms_manifest->end();
+          ++i )
+    {
+        wxPluginLibrary * const lib = i->second;
 
-    for(node = ms_manifest->Next(); node; node = ms_manifest->Next())
+        if ( lib->GetLibHandle() == handle )
-        if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle )
+            return lib;
-            return (wxPluginLibrary*)node->GetData();
+    }
 
     return NULL;
 }
@@ -645,27 +647,30 @@ 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;
+    wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
-    ms_manifest->BeginFind();
 
-    // It's either this or store the name of the lib just to do this.
+    for ( wxDLManifest::iterator i = ms_manifest->begin();
-
+          i != ms_manifest->end();
-    for(node = ms_manifest->Next(); node; node = ms_manifest->Next())
+          ++i )
-        if( (wxPluginLibrary*)node->GetData() == m_entry )
-            break;
-
-    if( m_entry && m_entry->UnrefLib() )
     {
-        delete node;
+        if ( i->second == m_entry )
-        m_entry = 0;
+        {
+            ms_manifest->erase(i);
+            return;
         }
     }
 
+    m_entry->UnrefLib();
+
+    m_entry = NULL;
+}
+
 // ---------------------------------------------------------------------------
 // wxDllLoader   (all these methods are static)
 // ---------------------------------------------------------------------------