X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00711afdd67f3e804f00f44da1fc60d5904bb61e..0a4090e635a3765e62181ecf039914c2c27df63c:/src/msw/dlmsw.cpp diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index 7faff796a5..39830797dc 100644 --- a/src/msw/dlmsw.cpp +++ b/src/msw/dlmsw.cpp @@ -139,9 +139,12 @@ HMODULE wxGetModuleHandle(const char *name, void *addr) } // Windows CE only has Unicode API, so even we have an ANSI string here, we - // still need to use GetModuleHandleW() there and so do it everywhere to - // avoid #ifdefs -- this code is not performance-critical anyhow... - return ::GetModuleHandle(wxString::FromAscii((char *)name)); + // still need to use GetModuleHandleW() there +#ifdef __WXWINCE__ + return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data()); +#else + return ::GetModuleHandleA((char *)name); +#endif } // ============================================================================ @@ -278,7 +281,7 @@ wxDllType wxDynamicLibrary::GetProgramHandle() wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags)) { - return ::LoadLibrary(libname); + return ::LoadLibrary(libname.wx_str()); } /* static */