X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee682a94cb9ea835c9b74a12f17b0fb63f43dcce..22c2307c2b1cc454846d066f95e4be2e72ce61cd:/src/common/dynlib.cpp?ds=sidebyside

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index f4cb7d11bc..90945e8cae 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -146,7 +146,7 @@ wxLibrary::wxLibrary(wxDllType handle)
     m_handle = handle;
 
     // Some system may use a local heap for library.
-    get_first = (t_get_first)GetSymbol("wxGetClassFirst");
+    get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));
     // It is a wxWindows DLL.
     if (get_first)
         PrepareClasses(get_first());
@@ -310,12 +310,8 @@ void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *su
     CFragSymbolClass    symClass;
     Str255              symName;
 
-#if TARGET_CARBON
-    c2pstrcpy( (StringPtr) symName, name );
-#else
-    strcpy( (char *) symName, name );
-    c2pstr( (char *) symName );
-#endif
+	wxMacStringToPascal( name.c_str() , symName ) ;
+
     if( FindSymbol( ((CFragConnectionID)dllHandle), symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 
@@ -484,15 +480,19 @@ int dlclose(void *handle)
     return 0;
 }
 
-void *dlsym(void *WXUNUSED(handle), const char *symbol)
+void *dlsym(void *handle, const char *symbol)
 {
     void *addr;
+    
+    NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
 
-    if (NSIsSymbolNameDefined(symbol)) {
-	addr = NSAddressOfSymbol(NSLookupAndBindSymbol(symbol));
+    if ( nsSymbol) 
+    {
+	    addr = NSAddressOfSymbol(nsSymbol);
     }
-    else {
-	addr = NULL;
+    else 
+    {
+	    addr = NULL;
     }
     return addr;
 }