Changes to the XRC library:

[wxWidgets.git] / src / common / dynload.cpp

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index e4d3887695743afd18c8af1dcbf5543ee4ff3ba3..3b2ff4bf0e336f7a232a66d556f32d229e0687ad 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -192,7 +192,7 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name)
     {
         wxString msg(_("Failed to load shared library '%s'"));
 #ifdef HAVE_DLERROR
-        wxChar  *err = dlerror();
+        const wxChar  *err = dlerror();
         if( err )
             wxLogError( msg, err );
 #else
@@ -237,7 +237,7 @@ void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *su
     {
         wxString msg(_("wxDllLoader failed to GetSymbol '%s'"));
 #ifdef HAVE_DLERROR
-        wxChar  *err = dlerror();
+        const wxChar *err = dlerror();
         if( err )
         {
             failed = TRUE;
@@ -267,7 +267,8 @@ wxDLManifestEntry::wxDLManifestEntry( const wxString &libname )
         : m_before(wxClassInfo::sm_first)
         , m_handle(wxDllLoader::LoadLibrary( libname ))
         , m_after(wxClassInfo::sm_first)
-        , m_count(1)
+        , m_linkcount(1)
+        , m_objcount(0)
 {
     if( m_handle != 0 )
     {
@@ -275,17 +276,29 @@ wxDLManifestEntry::wxDLManifestEntry( const wxString &libname )
         RegisterModules();
     }
     else
-        --m_count;      // Flag us for deletion
+        --m_linkcount;      // Flag us for deletion
 }
 
 wxDLManifestEntry::~wxDLManifestEntry()
 {
-    UnregisterModules();
-    RestoreClassInfo();
-
-    wxDllLoader::UnloadLibrary(m_handle);
+    if( m_handle != 0 )
+    {
+        UnregisterModules();
+        RestoreClassInfo();
+        wxDllLoader::UnloadLibrary(m_handle);
+    }
 }
 
+bool wxDLManifestEntry::UnrefLib()
+{
+    wxASSERT_MSG( m_objcount == 0, _T("Library unloaded before all objects were destroyed") );
+    if( m_linkcount == 0 || --m_linkcount == 0 )
+    {
+        delete this;
+        return TRUE;
+    }
+    return FALSE;
+}
 
 // ------------------------
 // Private methods
@@ -362,7 +375,7 @@ void wxDLManifestEntry::RegisterModules()
     // the library is.  We do have to keep a copy of the module's pointer
     // though, as there is currently no way to Unregister it without it.
 
-    wxASSERT_MSG( m_count == 1,
+    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)
@@ -401,7 +414,7 @@ void wxDLManifestEntry::RegisterModules()
                 oldNode = node;
             } while( node );
 
-            --m_count;     // Flag us for deletion
+            --m_linkcount;     // Flag us for deletion
             break;
         }
     }
@@ -437,7 +450,7 @@ wxDLManifestEntry *wxDynamicLibrary::Link(const wxString &libname)
 
     if( entry )
     {
-        entry->Ref();
+        entry->RefLib();
     }
     else
     {
@@ -449,7 +462,7 @@ wxDLManifestEntry *wxDynamicLibrary::Link(const wxString &libname)
         }
         else
         {
-            wxCHECK_MSG( !entry->Unref(), 0,
+            wxCHECK_MSG( entry->UnrefLib(), 0,
                          _T("Currently linked library is, ..not loaded??") );
             entry = 0;
         }
@@ -462,7 +475,7 @@ bool wxDynamicLibrary::Unlink(const wxString &libname)
     wxDLManifestEntry *entry = (wxDLManifestEntry*) ms_manifest.Get(libname);
 
     if( entry )
-        return entry->Unref();
+        return entry->UnrefLib();
 
     wxLogDebug(_T("Attempt to Unlink library '%s' (which is not linked)."), libname.c_str());
     return 0;
@@ -478,7 +491,7 @@ wxDynamicLibrary::wxDynamicLibrary(const wxString &libname)
 
     if( m_entry != 0 )
     {
-        m_entry->Ref();
+        m_entry->RefLib();
     }
     else
     {
@@ -500,7 +513,7 @@ wxDynamicLibrary::~wxDynamicLibrary()
         if( (wxDLManifestEntry*)node->GetData() == m_entry )
             break;
 
-    if( m_entry && m_entry->Unref() )
+    if( m_entry && m_entry->UnrefLib() )
         delete node;
 }