wxString ver;
if ( m_dll.IsLoaded() )
{
- wxChar *pc = wx_const_cast(wxChar *, (const wxChar*) filename.t_str());
+ wxChar *pc = const_cast<wxChar *>((const wxChar*) filename.t_str());
DWORD dummy;
DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy);
{
void *pVer;
UINT sizeInfo;
- if ( m_pfnVerQueryValue(buf.data(), _T("\\"), &pVer, &sizeInfo) )
+ if ( m_pfnVerQueryValue(buf.data(),
+ const_cast<wxChar *>(_T("\\")),
+ &pVer,
+ &sizeInfo) )
{
VS_FIXEDFILEINFO *info = (VS_FIXEDFILEINFO *)pVer;
ver.Printf(_T("%d.%d.%d.%d"),
/* 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 */