Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated mac implementation to support the success parameter , the new filename2filespec call and reintroduced the disappeared dllClose definition

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-05-29 17:49:34 +00:00
parent c257d44dd2
commit 763ca781fa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dynlib.cpp
View File

@@ -98,6 +98,8 @@ const char *dlerror(void);
# endif // Win32/16 # endif // Win32/16
# define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name) # define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name)
# define wxDllClose ::FreeLibrary # define wxDllClose ::FreeLibrary
#elif defined(__WXMAC__)
# define wxDllClose(handle) CloseConnection(&handle)
#else #else
# error "Don't know how to load shared libraries on this platform." # error "Don't know how to load shared libraries on this platform."
#endif // OS #endif // OS
@@ -235,13 +237,13 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
Ptr myMainAddr ; Ptr myMainAddr ;
Str255 myErrName ; Str255 myErrName ;
wxMacPathToFSSpec( libname , &myFSSpec ) ; wxMacFilename2FSSpec( libname , &myFSSpec ) ;
if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr , if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
myErrName ) != noErr ) myErrName ) != noErr )
{ {
p2cstr( myErrName ) ; p2cstr( myErrName ) ;
wxASSERT_MSG( 1 , (char*)myErrName ) ; wxLogSysError( _("Failed to load shared library '%s' Error '%s'") , libname.c_str() , (char*)myErrName ) ;
return NULL ; handle = NULL ;
} }
#elif defined(__WXPM__) || defined(__EMX__) #elif defined(__WXPM__) || defined(__EMX__)
char zError[256] = ""; char zError[256] = "";