merged MapBitmap() from 2.2 branch

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 796231c31a802126e309007dba09f356c737742d..5c93399eee466932826be97f12f5e5d33360eb31 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -98,6 +98,8 @@ const char *dlerror(void);
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary

+#elif defined(__WXMAC__)
+#   define wxDllClose(handle)               CloseConnection(&handle)

 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS
 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS


@@ -166,7 +168,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
     {
         if (info->m_className)
             classTable.Put(info->m_className, (wxObject *)info);
     {
         if (info->m_className)
             classTable.Put(info->m_className, (wxObject *)info);

-        info = info->GetNext();
+        info = (wxClassInfo *)info->GetNext();

     }
 
     // Set base pointers for each wxClassInfo
     }
 
     // Set base pointers for each wxClassInfo


@@ -235,13 +237,13 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
     Ptr myMainAddr ;
     Str255 myErrName ;
 
     Ptr myMainAddr ;
     Str255 myErrName ;
 

-    wxMacPathToFSSpec( libname , &myFSSpec ) ;
+    wxMacFilename2FSSpec( libname , &myFSSpec ) ;

     if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
                 myErrName ) != noErr )
     {
         p2cstr( myErrName ) ;
     if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
                 myErrName ) != noErr )
     {
         p2cstr( myErrName ) ;

-        wxASSERT_MSG( 1 , (char*)myErrName ) ;
-        return NULL ;
+        wxLogSysError( _("Failed to load shared library '%s' Error '%s'") , libname.c_str() , (char*)myErrName ) ;
+        handle = NULL ;

     }
 #elif defined(__WXPM__) || defined(__EMX__)
     char zError[256] = "";
     }
 #elif defined(__WXPM__) || defined(__EMX__)
     char zError[256] = "";


@@ -363,7 +365,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     if (node != NULL)
         return ((wxLibrary *)node->Data());
 #else // !OS/2
     if (node != NULL)
         return ((wxLibrary *)node->Data());
 #else // !OS/2

-    if ( (node = m_loaded.Find(name.GetData())) )
+    if ( (node = m_loaded.Find(name.GetData())) != NULL)

         return ((wxLibrary *)node->Data());
 #endif
     // If DLL shares data, this is necessary.
         return ((wxLibrary *)node->Data());
 #endif
     // If DLL shares data, this is necessary.