X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b568d04ffa191f9e3b643ca33526094eca0ba304..bfb9ee966d5d1f29e49f38e340812ade4b3cc956:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index e580f24650..3e6653c834 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -128,19 +128,19 @@ #ifdef StartDoc #undef StartDoc - #ifdef __GNUG__ + #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 ) #define DOCINFOW DOCINFO #define DOCINFOA DOCINFO #endif #ifdef _UNICODE inline int StartDoc(HDC h, CONST DOCINFOW* info) { - return StartDocW(h, info); + return StartDocW(h, (DOCINFOW*) info); } #else inline int StartDoc(HDC h, CONST DOCINFOA* info) { - return StartDocA(h, info); + return StartDocA(h, (DOCINFOA*) info); } #endif #endif @@ -177,27 +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 #endif // FindResource #ifdef FindResource #undef FindResource - inline HRSRC FindResource(HMODULE hModule, LPCTSTR lpName, LPCTSTR lpType) - { #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 #endif // IsMaximized