diff --git a/include/wx/dynload.h b/include/wx/dynload.h index 4e5c5c09fc..8aaa926807 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -301,7 +301,7 @@ class WXDLLEXPORT wxDllLoader { public: - static wxDllType LoadLibrary(const wxString& name); + static wxDllType LoadLibrary(const wxString& name, bool *success = NULL); static void UnloadLibrary(wxDllType dll); static wxDllType GetProgramHandle() { return wxDynamicLibrary::GetProgramHandle(); } diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index f330d81665..daf499db98 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -657,7 +657,7 @@ void wxPluginManager::Unload() #if WXWIN_COMPATIBILITY_2_2 -wxDllType wxDllLoader::LoadLibrary(const wxString &name) +wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success) { wxPluginLibrary *p = wxPluginManager::LoadLibrary ( @@ -665,6 +665,9 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name) wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE ); + if ( success ) + *success = p != NULL; + return p ? p->GetLibHandle() : 0; }