Added inline setters for wxTreeEvent so we don't need to add new

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index de22c603ce187d1f033da712a2ece8ae848e596c..a03732173caa7ca24f436abfd2b05875bcaa64ef 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -7,7 +7,7 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>

-// Licence:      wxWindows license
+// Licence:      wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -33,9 +33,11 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/hash.h"

 #endif
 
 #include "wx/filename.h"        // for SplitPath()
 #endif
 
 #include "wx/filename.h"        // for SplitPath()

+#include "wx/strconv.h"

 
 #include "wx/dynload.h"
 #include "wx/module.h"
 
 #include "wx/dynload.h"
 #include "wx/module.h"


@@ -65,12 +67,12 @@ const char *dlerror(void);
 //        platform dependent files.
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
 //        platform dependent files.
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)

-    const wxChar *wxDynamicLibrary::ms_dllext( _T(".dll") );
+    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");

 #elif defined(__UNIX__)
     #if defined(__HPUX__)
 #elif defined(__UNIX__)
     #if defined(__HPUX__)

-        const wxChar *wxDynamicLibrary::ms_dllext( _T(".sl") );
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");

     #else
     #else

-        const wxChar *wxDynamicLibrary::ms_dllext( _T(".so") );
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");

     #endif
 #endif
 
     #endif
 #endif
 


@@ -102,6 +104,9 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
         }
     }
 
         }
     }
 

+    // different ways to load a shared library
+    //
+    // FIXME: should go to the platform-specific files!

 #if defined(__WXMAC__) && !defined(__DARWIN__)
     FSSpec      myFSSpec;
     Ptr         myMainAddr;
 #if defined(__WXMAC__) && !defined(__DARWIN__)
     FSSpec      myFSSpec;
     Ptr         myMainAddr;


@@ -133,29 +138,39 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
 
 #if defined(__VMS) || defined(__DARWIN__)
     m_handle = dlopen(libname.c_str(), 0);  // The second parameter is ignored
 
 #if defined(__VMS) || defined(__DARWIN__)
     m_handle = dlopen(libname.c_str(), 0);  // The second parameter is ignored

-#else
+#else // !__VMS  && !__DARWIN__

     int rtldFlags = 0;
 
     int rtldFlags = 0;
 

-    if( flags & wxDL_LAZY )
+    if ( flags & wxDL_LAZY )

     {
         wxASSERT_MSG( (flags & wxDL_NOW) == 0,
                       _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
     {
         wxASSERT_MSG( (flags & wxDL_NOW) == 0,
                       _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );

+#ifdef RTLD_LAZY

         rtldFlags |= RTLD_LAZY;
         rtldFlags |= RTLD_LAZY;

+#else
+        wxLogDebug(_T("wxDL_LAZY is not supported on this platform"));
+#endif

     }
     }

-    else if( flags & wxDL_NOW )
+    else if ( flags & wxDL_NOW )

     {
     {

+#ifdef RTLD_NOW

         rtldFlags |= RTLD_NOW;
         rtldFlags |= RTLD_NOW;

+#else
+        wxLogDebug(_T("wxDL_NOW is not supported on this platform"));
+#endif

     }
     }

-    if( flags & wxDL_GLOBAL )
+
+    if ( flags & wxDL_GLOBAL )

     {
     {

-#ifdef __osf__
-        wxLogDebug(_T("WARNING: RTLD_GLOBAL is not a supported on this platform."));
-#endif
+#ifdef RTLD_GLOBAL

         rtldFlags |= RTLD_GLOBAL;
         rtldFlags |= RTLD_GLOBAL;

+#else
+        wxLogDebug(_T("RTLD_GLOBAL is not supported on this platform."));
+#endif

     }
 
     }
 

-    m_handle = dlopen(libname.c_str(), rtldFlags);
-#endif  // __VMS || __DARWIN__
+    m_handle = dlopen(libname.fn_str(), rtldFlags);
+#endif  // __VMS || __DARWIN__ ?

 
 #elif defined(HAVE_SHL_LOAD)
     int shlFlags = 0;
 
 #elif defined(HAVE_SHL_LOAD)
     int shlFlags = 0;


@@ -170,20 +185,26 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
     {
         shlFlags |= BIND_IMMEDIATE;
     }
     {
         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());
 
 #elif defined(__WINDOWS__)
     m_handle = ::LoadLibrary(libname.c_str());

-

 #else
 #else

-#error  "runtime shared lib support not implemented"
+    #error  "runtime shared lib support not implemented on this platform"

 #endif
 
     if ( m_handle == 0 )
     {
         wxString msg(_("Failed to load shared library '%s'"));
 #if defined(HAVE_DLERROR) && !defined(__EMX__)
 #endif
 
     if ( m_handle == 0 )
     {
         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
         if( err )
             wxLogError( msg, err );
 #else


@@ -240,10 +261,13 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
 
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
     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)
 
 #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__)
         symbol = 0;
 
 #elif defined(__WINDOWS__)


@@ -255,13 +279,18 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 
     if ( !symbol )
     {
 
     if ( !symbol )
     {

-        wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'"));

 #if defined(HAVE_DLERROR) && !defined(__EMX__)
 #if defined(HAVE_DLERROR) && !defined(__EMX__)

+
+#if wxUSE_UNICODE
+        wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
+        const wxChar *err = buffer;
+#else

         const wxChar *err = dlerror();
         const wxChar *err = dlerror();

+#endif
+

         if( err )
         {
         if( err )
         {

-            failed = TRUE;
-            wxLogError( msg, err );
+            wxLogError(wxT("%s"), err);

         }
 #else
         failed = TRUE;
         }
 #else
         failed = TRUE;


@@ -389,9 +418,7 @@ void wxPluginLibrary::UpdateClassInfo()
 
             // Hash all the class names into a local table too so
             // we can quickly find the entry they correspond to.
 
             // 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;

         }
     }
 
         }
     }
 


@@ -411,7 +438,7 @@ void wxPluginLibrary::RestoreClassInfo()
     for(info = m_after; info != m_before; info = info->m_next)
     {
         wxClassInfo::sm_classTable->Delete(info->m_className);
     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 )
     }
 
     if( wxClassInfo::sm_first == m_after )


@@ -421,7 +448,7 @@ void wxPluginLibrary::RestoreClassInfo()
         info = wxClassInfo::sm_first;
         while( info->m_next && info->m_next != m_after ) info = info->m_next;
 
         info = wxClassInfo::sm_first;
         while( info->m_next && info->m_next != m_after ) info = info->m_next;
 

-        wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"))
+        wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"));

 
         info->m_next = m_before;
     }
 
         info->m_next = m_before;
     }


@@ -440,7 +467,7 @@ void wxPluginLibrary::RegisterModules()
     wxASSERT_MSG( m_linkcount == 1,
                   _T("RegisterModules should only be called for the first load") );
 
     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)) )
         {
     {
         if( info->IsKindOf(CLASSINFO(wxModule)) )
         {


@@ -455,7 +482,9 @@ void wxPluginLibrary::RegisterModules()
 
     // FIXME: Likewise this is (well was) very similar to InitializeModules()
 
 
     // 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() )
         {
     {
         if( !node->GetData()->Init() )
         {


@@ -486,10 +515,10 @@ void wxPluginLibrary::UnregisterModules()
 {
     wxModuleList::Node  *node;
 
 {
     wxModuleList::Node  *node;
 

-    for(node = m_wxmodules.GetFirst(); node; node->GetNext())
+    for ( node = m_wxmodules.GetFirst(); node; node = node->GetNext() )

         node->GetData()->Exit();
 
         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);
         wxModule::UnregisterModule( node->GetData() );
 
     m_wxmodules.DeleteContents(TRUE);


@@ -522,7 +551,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
     }
     else
     {
     }
     else
     {

-        entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+        entry = FindByName(realname);

     }
 
     if ( entry )
     }
 
     if ( entry )


@@ -538,7 +567,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags)
 
         if ( entry->IsLoaded() )
         {
 
         if ( entry->IsLoaded() )
         {

-            ms_manifest->Put(realname, (wxObject*) entry);
+            (*ms_manifest)[realname] = entry;

 
             wxLogTrace(_T("dll"),
                        _T("LoadLibrary(%s): loaded ok."), realname.c_str());
 
             wxLogTrace(_T("dll"),
                        _T("LoadLibrary(%s): loaded ok."), realname.c_str());


@@ -567,13 +596,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
 {
     wxString realname = libname;
 
 {
     wxString realname = libname;
 

-    wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+    wxPluginLibrary *entry = FindByName(realname);

 
     if ( !entry )
     {
         realname += wxDynamicLibrary::GetDllExt();
 
 
     if ( !entry )
     {
         realname += wxDynamicLibrary::GetDllExt();
 

-        entry = (wxPluginLibrary*) ms_manifest->Get(realname);
+        entry = FindByName(realname);

     }
 
     if ( !entry )
     }
 
     if ( !entry )


@@ -592,7 +621,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
         return FALSE;
     }
 
         return FALSE;
     }
 

-    ms_manifest->Delete(realname);
+    ms_manifest->erase(ms_manifest->find(realname));

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -600,12 +629,15 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname)
 #if WXWIN_COMPATIBILITY_2_2
 wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
 {
 #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;
 }
 
     return NULL;
 }


@@ -618,25 +650,28 @@ wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
 bool wxPluginManager::Load(const wxString &libname, int flags)
 {
     m_entry = wxPluginManager::LoadLibrary(libname, flags);
 bool wxPluginManager::Load(const wxString &libname, int flags)
 {
     m_entry = wxPluginManager::LoadLibrary(libname, flags);

+

     return IsLoaded();
 }
 
 void wxPluginManager::Unload()
 {
     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);
+            return;
+        }

     }
     }

+
+    m_entry->UnrefLib();
+
+    m_entry = NULL;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -645,7 +680,7 @@ void wxPluginManager::Unload()
 
 #if WXWIN_COMPATIBILITY_2_2
 
 
 #if WXWIN_COMPATIBILITY_2_2
 

-wxDllType wxDllLoader::LoadLibrary(const wxString &name)
+wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success)

 {
     wxPluginLibrary *p = wxPluginManager::LoadLibrary
                          (
 {
     wxPluginLibrary *p = wxPluginManager::LoadLibrary
                          (


@@ -653,6 +688,9 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name)
                             wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
                          );
 
                             wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
                          );
 

+    if ( success )
+        *success = p != NULL;
+

     return p ? p->GetLibHandle() : 0;
 }
 
     return p ? p->GetLibHandle() : 0;
 }