Took one part of the patch back again...

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 88f4b124bb70be3934e525ac791c8d50bb970e34..95f14b9e21489322888c31eb9697d8b1209fd85e 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -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;
     }
 
@@ -327,7 +326,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     wxCHECK_MSG( IsLoaded(), NULL,
                  _T("Can't load symbol from unloaded library") );
 
-    bool     failed = FALSE;
+    bool     failed = false;
     void    *symbol = 0;
 
     wxUnusedVar(symbol);
@@ -384,7 +383,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
             wxLogError(wxT("%s"), err);
         }
 #else
-        failed = TRUE;
+        failed = true;
         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
                       name.c_str());
 #endif