projects
/
wxWidgets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d11cd57
)
#undef LoadBitmap() too
author
Vadim Zeitlin
<vadim@wxwidgets.org>
Wed, 8 Jan 2003 12:27:28 +0000
(12:27 +0000)
committer
Vadim Zeitlin
<vadim@wxwidgets.org>
Wed, 8 Jan 2003 12:27:28 +0000
(12:27 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18643
c3d73ce0
-8a6f-49c7-b76d-
6d57e0e08775
include/wx/msw/winundef.h
patch
|
blob
|
blame
|
history
diff --git
a/include/wx/msw/winundef.h
b/include/wx/msw/winundef.h
index 905e0a443887f9253201c7c639e102e4534d30cc..6c0b049f299472acc38d775d7017f90cc226fb08 100644
(file)
--- 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