X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87ec9b8f6f0e0fffafb5b2280963a6338f3c5b94..fbd11d30c8499ef25989974ef6ec16fb5b759668:/src/common/dynlib.cpp?ds=inline

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index f8d9e8db9b..32019ad7e7 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -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;
 }
@@ -212,10 +212,9 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
                          &myMainAddr,
                          myErrName ) != noErr )
     {
-        p2cstr( myErrName );
         wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
                        libname.c_str(),
-                       (char*)myErrName );
+                       wxMacMakeStringFromPascal( myErrName ).c_str() );
         m_handle = 0;
     }
 
@@ -394,7 +393,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 
     return symbol;
 }
-    
+
 
 /*static*/
 wxString
@@ -441,7 +440,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;
     }
@@ -490,20 +489,27 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
 
     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
 }