Add accelerator back to label in GetItemLabel

[wxWidgets.git] / src / msw / dlmsw.cpp

diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp
index 7faff796a5f4c93818e04e4e3461576b97eb8265..39830797dc2e31407fdcaac24f88f12481c590c6 100644 (file)
--- 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 */