Save the alpha values if the image has an alpha channel

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 3ab2153462afdfdcaad3c8c0af9d4be295db10c8..88f4b124bb70be3934e525ac791c8d50bb970e34 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #   pragma implementation "dynlib.h"
 #endif
 
@@ -30,7 +30,7 @@
 #if wxUSE_DYNLIB_CLASS
 
 #if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
+    #include "wx/msw/wrapwin.h"
 #endif
 
 #include "wx/dynlib.h"
@@ -75,13 +75,13 @@ void TranslateError(const char *path, int number)
     unsigned int index;
     static char *OFIErrorStrings[] =
     {
-       "%s(%d): Object Image Load Failure\n",
-       "%s(%d): Object Image Load Success\n",
-       "%s(%d): Not an recognisable object file\n",
-       "%s(%d): No valid architecture\n",
-       "%s(%d): Object image has an invalid format\n",
-       "%s(%d): Invalid access (permissions?)\n",
-       "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
+        "%s(%d): Object Image Load Failure\n",
+        "%s(%d): Object Image Load Success\n",
+        "%s(%d): Not an recognisable object file\n",
+        "%s(%d): No valid architecture\n",
+        "%s(%d): Object image has an invalid format\n",
+        "%s(%d): Invalid access (permissions?)\n",
+        "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
     };
 #define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
 
@@ -106,13 +106,13 @@ void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
     dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
     if (dyld_result != NSObjectFileImageSuccess)
     {
-       TranslateError(path, dyld_result);
+        TranslateError(path, dyld_result);
     }
     else
     {
-       // NSLinkModule will cause the run to abort on any link error's
-       // not very friendly but the error recovery functionality is limited.
-       handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);
+        // NSLinkModule will cause the run to abort on any link error's
+        // not very friendly but the error recovery functionality is limited.
+        handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);
     }
 
     return handle;
@@ -127,16 +127,16 @@ int dlclose(void *handle)
 void *dlsym(void *handle, const char *symbol)
 {
     void *addr;
-    
+
     NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
 
-    if ( nsSymbol) 
+    if ( nsSymbol)
     {
-           addr = NSAddressOfSymbol(nsSymbol);
+        addr = NSAddressOfSymbol(nsSymbol);
     }
-    else 
+    else
     {
-           addr = NULL;
+        addr = NULL;
     }
     return addr;
 }
@@ -153,9 +153,13 @@ void *dlsym(void *handle, const char *symbol)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");
 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".dylib");
     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif
@@ -222,7 +226,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;
 
@@ -300,7 +304,8 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
     return IsLoaded();
 }
 
-/* static */ void wxDynamicLibrary::Unload(wxDllType handle)
+/* static */
+void wxDynamicLibrary::Unload(wxDllType handle)
 {
 #if defined(__WXPM__) || defined(__EMX__)
     DosFreeModule( handle );
@@ -313,7 +318,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
 #elif defined(__WXMAC__) && !defined(__DARWIN__)
     CloseConnection( (CFragConnectionID*) &handle );
 #else
-#error  "runtime shared lib support not implemented"
+    #error  "runtime shared lib support not implemented"
 #endif
 }
 
@@ -325,17 +330,18 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     bool     failed = FALSE;
     void    *symbol = 0;
 
+    wxUnusedVar(symbol);
 #if defined(__WXMAC__) && !defined(__DARWIN__)
     Ptr                 symAddress;
     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__)
@@ -352,7 +358,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"
@@ -384,7 +394,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 
     return symbol;
 }
-    
+
 
 /*static*/
 wxString
@@ -399,7 +409,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 {
     wxString nameCanonic;
 
-    // under Unix the library names usualyl start with "lib" prefix, add it
+    // under Unix the library names usually start with "lib" prefix, add it
 #ifdef __UNIX__
     switch ( cat )
     {
@@ -431,7 +441,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;
-        wxASSERT_MSG( traits, 
+        wxASSERT_MSG( traits,
                _("can't query for GUI plugins name in console applications") );
         suffix = traits->GetToolkitInfo().shortName;
     }
@@ -465,22 +475,42 @@ 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);
 }
-    
+
 /*static*/
 wxString wxDynamicLibrary::GetPluginsDirectory()
 {
 #ifdef __UNIX__
     wxString format = wxGetInstallPrefix();
+    wxString dir;
     format << wxFILE_SEP_PATH
            << wxT("lib") << wxFILE_SEP_PATH
            << wxT("wx") << wxFILE_SEP_PATH
+#if (wxMINOR_VERSION % 2) == 0
            << wxT("%i.%i");
-    wxString dir;
     dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
-    return dir;
 #else
+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
+
+#else // ! __UNIX__
     return wxEmptyString;
 #endif
 }