X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79bc2382e3b0cc4480864f2c6d891063a5328a18..82a5f02c861e8d57ba8255a9553b941118ad4520:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 356bb06ab1..7a078f9a76 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -128,7 +128,7 @@ #ifdef StartDoc #undef StartDoc - #ifdef __GNUWIN32__ + #ifdef __GNUG__ #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif @@ -177,14 +177,33 @@ #ifdef LoadLibrary #undef LoadLibrary - inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName) - { #ifdef _UNICODE + inline HINSTANCE LoadLibrary(LPCWSTR lpLibFileName) + { return LoadLibraryW(lpLibFileName); + } #else + inline HINSTANCE LoadLibrary(LPCSTR lpLibFileName) + { return LoadLibraryA(lpLibFileName); + } #endif +#endif + +// FindResource +#ifdef FindResource + #undef FindResource + #ifdef _UNICODE + inline HRSRC FindResource(HMODULE hModule, LPCWSTR lpName, LPCWSTR lpType) + { + return FindResourceW(hModule, lpName, lpType); + } + #else + inline HRSRC FindResource(HMODULE hModule, LPCSTR lpName, LPCSTR lpType) + { + return FindResourceA(hModule, lpName, lpType); } + #endif #endif // IsMaximized