don't load comctl32.dll, just get the handle of the already loaded instance of it instead, this avoids accidentally loading 2 different versions of this DLL in the same process (see #10203)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -282,9 +282,11 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
|
||||
|
||||
/* static */
|
||||
wxDllType
|
||||
wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags))
|
||||
wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
|
||||
{
|
||||
return ::LoadLibrary(libname.t_str());
|
||||
return flags & wxDL_GET_LOADED
|
||||
? ::GetModuleHandle(libname.t_str())
|
||||
: ::LoadLibrary(libname.t_str());
|
||||
}
|
||||
|
||||
/* static */
|
||||
|
Reference in New Issue
Block a user