fix bug in Borland (bcc32 really hates ?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -299,11 +299,11 @@ HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)
|
|||||||
|
|
||||||
bits = (char *)pbmih + sizeof(*pbmih) + numColors*sizeof(RGBQUAD);
|
bits = (char *)pbmih + sizeof(*pbmih) + numColors*sizeof(RGBQUAD);
|
||||||
}
|
}
|
||||||
HDC tmphdc = hdc;
|
|
||||||
if (!hdc) tmphdc = ScreenHDC();
|
|
||||||
HBITMAP hbmp = ::CreateDIBitmap
|
HBITMAP hbmp = ::CreateDIBitmap
|
||||||
(
|
(
|
||||||
tmphdc, // create bitmap compatible with this DC
|
hdc ? hdc // create bitmap compatible
|
||||||
|
: (HDC) ScreenHDC(), // with this DC
|
||||||
pbmih, // used to get size &c
|
pbmih, // used to get size &c
|
||||||
CBM_INIT, // initialize bitmap bits too
|
CBM_INIT, // initialize bitmap bits too
|
||||||
bits, // ... using this data
|
bits, // ... using this data
|
||||||
|
Reference in New Issue
Block a user