macro naming changes, delegate api calls getting property info, object info exposed...

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index fb869777e9717f327fd00a19492afcedea3be7b4..ab4178d9a0241ea9616738e947acd6576a3fe62d 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -222,7 +222,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
 
 #if defined(__VMS) || defined(__DARWIN__)
-    m_handle = dlopen(libname.c_str(), 0);  // The second parameter is ignored
+    m_handle = dlopen(libname.fn_str(), 0);  // The second parameter is ignored
 #else // !__VMS  && !__DARWIN__
     int rtldFlags = 0;
 
@@ -331,12 +331,12 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON
-    c2pstrcpy( (StringPtr) symName, name );
+    c2pstrcpy( (StringPtr) symName, name.fn_str() );
 #else
-    strcpy( (char *)symName, name );
+    strcpy( (char *)symName, name.fn_str() );
     c2pstr( (char *)symName );
 #endif
-    if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
+    if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)
@@ -353,7 +353,11 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
         symbol = 0;
 
 #elif defined(__WINDOWS__)
+#ifdef __WXWINCE__
+    symbol = (void*) ::GetProcAddress( m_handle, name );
+#else
     symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
+#endif
 
 #else
 #error  "runtime shared lib support not implemented"
@@ -466,6 +470,19 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
 #undef wxDLLVER
 #undef WXSTRINGIZE
 
+#ifdef __WINDOWS__
+    // Add compiler identification:
+    #if defined(__GNUG__)
+        suffix << _T("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << _T("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << _T("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << _T("_bcc");
+    #endif
+#endif
+
     return CanonicalizeName(name + suffix, wxDL_MODULE);
 }