Added some typecasts that the compiler complained about not having
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -106,7 +106,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
|||||||
// create pens
|
// create pens
|
||||||
HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
|
HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
|
||||||
hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),
|
hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),
|
||||||
hpenPrev = SelectObject(hdc, hpenBack);
|
hpenPrev = (HPEN)SelectObject(hdc, hpenBack);
|
||||||
|
|
||||||
// we erase the 1-pixel border
|
// we erase the 1-pixel border
|
||||||
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
||||||
@@ -118,7 +118,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
|||||||
// first create a monochrome bitmap in a memory DC
|
// first create a monochrome bitmap in a memory DC
|
||||||
HDC hdcMem = CreateCompatibleDC(hdc);
|
HDC hdcMem = CreateCompatibleDC(hdc);
|
||||||
HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);
|
HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);
|
||||||
HBITMAP hbmpOld = SelectObject(hdcMem, hbmpCheck);
|
HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
|
||||||
|
|
||||||
// then draw a check mark into it
|
// then draw a check mark into it
|
||||||
RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
|
RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
|
||||||
@@ -158,7 +158,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
|
|||||||
|
|
||||||
// draw hollow gray rectangle
|
// draw hollow gray rectangle
|
||||||
(void)SelectObject(hdc, hpenGray);
|
(void)SelectObject(hdc, hpenGray);
|
||||||
HBRUSH hbrPrev = SelectObject(hdc, GetStockObject(NULL_BRUSH));
|
HBRUSH hbrPrev = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH));
|
||||||
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
|
||||||
|
|
||||||
// clean up
|
// clean up
|
||||||
|
Reference in New Issue
Block a user