projects
/
wxWidgets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
810f173
)
fix bug in Borland (bcc32 really hates ?)
author
Chris Elliott
<biol75@york.ac.uk>
Mon, 24 Mar 2003 08:44:08 +0000
(08:44 +0000)
committer
Chris Elliott
<biol75@york.ac.uk>
Mon, 24 Mar 2003 08:44:08 +0000
(08:44 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19746
c3d73ce0
-8a6f-49c7-b76d-
6d57e0e08775
src/msw/dib.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/msw/dib.cpp
b/src/msw/dib.cpp
index fe4136e2a3b35ec72532d961751e3a0608636011..5cd30f4f41b5d4bda70eebef4d17c2ad576f9240 100644
(file)
--- a/
src/msw/dib.cpp
+++ b/
src/msw/dib.cpp
@@
-299,11
+299,11
@@
HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)
bits = (char *)pbmih + sizeof(*pbmih) + numColors*sizeof(RGBQUAD);
}
-
+ HDC tmphdc = hdc;
+ if (!hdc) tmphdc = ScreenHDC();
HBITMAP hbmp = ::CreateDIBitmap
(
- hdc ? hdc // create bitmap compatible
- : ScreenHDC(), // with this DC
+ tmphdc, // create bitmap compatible with this DC
pbmih, // used to get size &c
CBM_INIT, // initialize bitmap bits too
bits, // ... using this data