From: Vadim Zeitlin Date: Wed, 8 Jan 2003 12:27:28 +0000 (+0000) Subject: #undef LoadBitmap() too X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/381adb7449f4042d4be496273edfcbaddc21b8d6?ds=inline #undef LoadBitmap() too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index 905e0a4438..6c0b049f29 100644 --- a/include/wx/msw/winundef.h +++ b/include/wx/msw/winundef.h @@ -265,6 +265,18 @@ } #endif // LoadIcon +// LoadBitmap +#ifdef LoadBitmap + #undef LoadBitmap + inline HBITMAP LoadBitmap(HINSTANCE hInstance, LPCTSTR lpBitmapName) + { + #ifdef _UNICODE + return LoadBitmapW(hInstance, lpBitmapName); + #else // ANSI + return LoadBitmapA(hInstance, lpBitmapName); + #endif // Unicode/ANSI + } +#endif // LoadBitmap // LoadLibrary