Ambiguous overload fix for gcc

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index fd1f380d1b45e94244d099d07fb5c641e2d6031f..562b6ce975a7d0fd2e23a32ac7ecaa3a6fd40f6e 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -7,13 +7,9 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
-// Licence:      wxWidgets licence
+// Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dynload.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -60,7 +56,7 @@ public:
     {
         wxPluginLibrary::ms_classes = new wxDLImports;
         wxPluginManager::CreateManifest();
-        return TRUE;
+        return true;
     }
 
     virtual void OnExit()
@@ -120,13 +116,13 @@ bool wxPluginLibrary::UnrefLib()
     wxASSERT_MSG( m_objcount == 0,
                   _T("Library unloaded before all objects were destroyed") );
 
-    if ( --m_linkcount == 0 )
+    if ( m_linkcount == 0 || --m_linkcount == 0 )
     {
         delete this;
-        return TRUE;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 // ------------------------
@@ -137,20 +133,24 @@ void wxPluginLibrary::UpdateClasses()
 {
     for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
     {
-        if( info->m_className )
+        if( info->GetClassName() )
         {
             // 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;
+            (*ms_classes)[info->GetClassName()] = this;
         }
     }
 }
 
 void wxPluginLibrary::RestoreClasses()
 {
+    // Check if there is a need to restore classes.
+    if (!ms_classes)
+        return;
+
     for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
     {
-        ms_classes->erase(ms_classes->find(info->m_className));
+        ms_classes->erase(ms_classes->find(info->GetClassName()));
     }
 }
 
@@ -222,7 +222,8 @@ void wxPluginLibrary::UnregisterModules()
     for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
         wxModule::UnregisterModule( *it );
 
-    WX_CLEAR_LIST(wxModuleList, m_wxmodules);
+    // NB: content of the list was deleted by UnregisterModule calls above:
+    m_wxmodules.clear();
 }
 
 
@@ -311,7 +312,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
         wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
                    libname.c_str());
 
-        return FALSE;
+        return false;
     }
 
     wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
@@ -319,12 +320,12 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
     if ( !entry->UnrefLib() )
     {
         // not really unloaded yet
-        return FALSE;
+        return false;
     }
 
     ms_manifest->erase(ms_manifest->find(realname));
 
-    return TRUE;
+    return true;
 }
 
 // ------------------------
@@ -415,7 +416,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)
         wxFAIL_MSG( _T("Using a library not loaded with wxDllLoader?") );
 
         if ( success )
-            *success = FALSE;
+            *success = false;
 
         return NULL;
     }
@@ -521,13 +522,13 @@ wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
 
 wxLibraries::~wxLibraries()
 {
-    wxNode *node = m_loaded.First();
+    wxNode *node = m_loaded.GetFirst();
 
     while (node) {
-        wxLibrary *lib = (wxLibrary *)node->Data();
+        wxLibrary *lib = (wxLibrary *)node->GetData();
         delete lib;
 
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 
@@ -538,7 +539,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxNode      *node = m_loaded.Find(name.GetData());
 
     if (node != NULL)
-        return ((wxLibrary *)node->Data());
+        return ((wxLibrary *)node->GetData());
 
     // If DLL shares data, this is necessary.
     old_sm_first = wxClassInfo::sm_first;
@@ -546,7 +547,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 
     wxString libname = ConstructLibraryName(name);
 
-    bool success = FALSE;
+    bool success = false;
     wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
     if(success)
     {
@@ -562,15 +563,15 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 
 wxObject *wxLibraries::CreateObject(const wxString& path)
 {
-    wxNode *node = m_loaded.First();
+    wxNode *node = m_loaded.GetFirst();
     wxObject *obj;
 
     while (node) {
-        obj = ((wxLibrary *)node->Data())->CreateObject(path);
+        obj = ((wxLibrary *)node->GetData())->CreateObject(path);
         if (obj)
             return obj;
 
-        node = node->Next();
+        node = node->GetNext();
     }
     return NULL;
 }