Applied patch [ 662321 ] Port of wxWindows to Wine

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index b6cbcec443da2d173269d407d969fab122d13d20..558b579e0c53694b17f31fb36fed426d339c9b18 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -146,7 +146,7 @@ wxLibrary::wxLibrary(wxDllType handle)
     m_handle = handle;
 
     // Some system may use a local heap for library.
     m_handle = handle;
 
     // Some system may use a local heap for library.

-    get_first = (t_get_first)GetSymbol("wxGetClassFirst");
+    get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));

     // It is a wxWindows DLL.
     if (get_first)
         PrepareClasses(get_first());
     // It is a wxWindows DLL.
     if (get_first)
         PrepareClasses(get_first());


@@ -333,14 +333,11 @@ void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *su
 
     if ( !symbol )
     {
 
     if ( !symbol )
     {

-        wxString msg(_("wxDllLoader failed to GetSymbol '%s'"));
-

 #ifdef HAVE_DLERROR
         const wxChar *err = dlerror();
         if( err )
         {
 #ifdef HAVE_DLERROR
         const wxChar *err = dlerror();
         if( err )
         {

-            failed = TRUE;
-            wxLogError( msg, err );
+            wxLogError(wxT("%s"), err);

         }
 #else
         failed = TRUE;
         }
 #else
         failed = TRUE;