X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e2411ab49b01f0dbbc1a5f42f1914c85e476d73..b1f68ca3455436222b8704dccdecdb06087c4e7f:/include/wx/msw/winundef.h diff --git a/include/wx/msw/winundef.h b/include/wx/msw/winundef.h index a3f6a6c99d..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 @@ -341,7 +353,7 @@ // For WINE -#if defined(GetWindowStyle) || defined(__WXWINE__) +#if defined(GetWindowStyle) #undef GetWindowStyle #endif