Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added some typecasts that the compiler complained about not having

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-08-27 23:32:09 +00:00
parent 0d6f9504ae
commit 451871970b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/checklst.cpp
View File

@@ -2,7 +2,7 @@
// Name: msw/checklst.cpp // Name: msw/checklst.cpp
// Purpose: implementation of wxCheckListBox class // Purpose: implementation of wxCheckListBox class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
// Created: 16.11.97 // Created: 16.11.97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -87,7 +87,7 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
* check until you click to the right of it, which is OK for WIN32. * check until you click to the right of it, which is OK for WIN32.
*/ */
bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
wxODAction act, wxODStatus stat) wxODAction act, wxODStatus stat)
{ {
if ( IsChecked() ) if ( IsChecked() )
@@ -97,8 +97,8 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
// ## using native API for performance and precision // ## using native API for performance and precision
size_t nCheckWidth = GetDefaultMarginWidth(), size_t nCheckWidth = GetDefaultMarginWidth(),
nCheckHeight = m_pParent->GetItemHeight(); nCheckHeight = m_pParent->GetItemHeight();
int x = rc.GetX(), int x = rc.GetX(),
y = rc.GetY(); y = rc.GetY();
HDC hdc = (HDC)dc.GetHDC(); HDC hdc = (HDC)dc.GetHDC();
@@ -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 };
@@ -143,7 +143,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
#endif #endif
// finally copy it to screen DC and clean up // finally copy it to screen DC and clean up
BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight, BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,
hdcMem, 0, 0, SRCCOPY); hdcMem, 0, 0, SRCCOPY);
SelectObject(hdcMem, hbmpOld); SelectObject(hdcMem, hbmpOld);
@@ -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
@@ -185,7 +185,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
// change the state of the item and redraw it // change the state of the item and redraw it
void wxCheckListBoxItem::Toggle() void wxCheckListBoxItem::Toggle()
{ {
m_bChecked = !m_bChecked; m_bChecked = !m_bChecked;
size_t nHeight = m_pParent->GetItemHeight(); size_t nHeight = m_pParent->GetItemHeight();