X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42404a58eac2c9eb0557565a471a794c387a715..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 5747dc5e79..a0e585cb5f 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -45,7 +45,7 @@ #include #include -#ifdef __GNUWIN32_OLD__ +#if defined(__GNUWIN32_OLD__) #include "wx/msw/gnuwin32/extra.h" #endif @@ -144,16 +144,14 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck); // then draw a check mark into it - RECT rect ; - rect.left = 0 ; - rect.top = 0 ; - rect.right = nCheckWidth ; - rect.bottom = nCheckHeight ; - -#ifdef __WIN32__ -#ifndef __SC__ +#if defined(__WIN32__) && !defined(__SC__) + RECT rect; + rect.left = 0; + rect.top = 0; + rect.right = nCheckWidth; + rect.bottom = nCheckHeight; + DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); -#endif #else // In WIN16, draw a cross HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); @@ -298,7 +296,7 @@ void wxCheckListBox::Delete(int N) // free memory delete m_aItems[N]; - m_aItems.Remove(N); + m_aItems.RemoveAt(N); } void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)