in wxAuiNotebook, code to reduce flicker on page close

[wxWidgets.git] / src / unix / dlunix.cpp

diff --git a/src/unix/dlunix.cpp b/src/unix/dlunix.cpp
index efe3f7e2ef2dfe5c6e782982fdaa80867eaea8b6..2c9fec3b3ca8dcd3737021454043de9776e18c67 100644 (file)
--- a/src/unix/dlunix.cpp
+++ b/src/unix/dlunix.cpp
@@ -65,11 +65,11 @@
 
 // standard shared libraries extensions for different Unix versions
 #if defined(__HPUX__)
 
 // standard shared libraries extensions for different Unix versions
 #if defined(__HPUX__)

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    const wxString wxDynamicLibrary::ms_dllext(".sl");

 #elif defined(__DARWIN__)
 #elif defined(__DARWIN__)

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
+    const wxString wxDynamicLibrary::ms_dllext(".bundle");

 #else
 #else

-    const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+    const wxString wxDynamicLibrary::ms_dllext(".so");

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -271,14 +271,12 @@ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
 /* static */
 void wxDynamicLibrary::Error()
 {
 /* static */
 void wxDynamicLibrary::Error()
 {

-#if wxUSE_UNICODE
-    wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
-    const wxChar *err = buffer;
-#else
-    const wxChar *err = dlerror();
-#endif
+    wxString err(dlerror());
+
+    if ( err.empty() )
+        err = _("Unknown dynamic library error");

 
 

-    wxLogError(wxT("%s"), err ? err : _("Unknown dynamic library error"));
+    wxLogError(wxT("%s"), err);

 }
 
 #endif // wxHAVE_DYNLIB_ERROR
 }
 
 #endif // wxHAVE_DYNLIB_ERROR