Added (untested) support for sub-locales.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 91f3c16577a3f5ceff5ebebaafbb3c25b39059eb..6b8bf78e38f06d4cbd4e15fbae7ad8120acd3db8 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -117,9 +117,20 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 {
 #if defined(__UNIX__)
   return dlsym(m_handle, WXSTRINGCAST symbname);
 {
 #if defined(__UNIX__)
   return dlsym(m_handle, WXSTRINGCAST symbname);

-#endif
-#ifdef __WINDOWS__
+#elif defined( __WINDOWS__ )

   return GetProcAddress((HINSTANCE) m_handle, WXSTRINGCAST symbname);
   return GetProcAddress((HINSTANCE) m_handle, WXSTRINGCAST symbname);

+#elif defined( __WXMAC__ )
+  Ptr symAddress ;
+  CFragSymbolClass symClass ;
+  Str255       symName ;
+       
+  strcpy( (char*) symName , symbname ) ;
+  c2pstr( (char*) symName ) ;
+       
+  if ( FindSymbol( (CFragConnectionID) m_handle , symName , &symAddress , &symClass ) == noErr )
+  {
+    return symAddress ; 
+  }

 #endif
   return NULL;
 }
 #endif
   return NULL;
 }


@@ -175,11 +186,29 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 
 #ifdef UNICODE
   HMODULE handle = LoadLibraryW(lib_name);
 
 #ifdef UNICODE
   HMODULE handle = LoadLibraryW(lib_name);

+#else
+#ifdef __WIN16__
+  HMODULE handle = ::LoadLibrary(lib_name);

 #else
   HMODULE handle = LoadLibraryA(lib_name);
 #else
   HMODULE handle = LoadLibraryA(lib_name);

+#endif

 #endif
   if (!handle)
     return NULL;
 #endif
   if (!handle)
     return NULL;

+#elif defined(__WXMAC__)
+  FSSpec myFSSpec ;
+  CFragConnectionID handle ;
+  Ptr  myMainAddr ;
+  Str255       myErrName ;
+       
+  wxMacPathToFSSpec( lib_name , &myFSSpec ) ;
+  if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
+    myErrName ) != noErr )
+  {
+    p2cstr( myErrName ) ;
+    wxASSERT_MSG( 1 , (char*)myErrName ) ;
+       return NULL ;
+  }

 #else
   return NULL;
 #endif
 #else
   return NULL;
 #endif