X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/msw/checklst.cpp diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 78606eee75..a0e585cb5f 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -45,8 +45,8 @@ #include #include -#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS) -#include "wx/msw/gnuwin32/extra.h" +#if defined(__GNUWIN32_OLD__) + #include "wx/msw/gnuwin32/extra.h" #endif // ---------------------------------------------------------------------------- @@ -60,9 +60,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class @@ -146,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)); @@ -300,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) @@ -314,7 +310,10 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) for ( i = 0; i < nItems; i++ ) { wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i)); pNewItem->SetName(items[i]); + pNewItem->SetFont(GetFont()); + m_aItems.Insert(pNewItem, (size_t)(pos + i)); + ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem); } } @@ -323,9 +322,11 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos) bool wxCheckListBox::SetFont( const wxFont &font ) { size_t i; - for (i=0; i < m_aItems.GetCount(); i++) + for ( i = 0; i < m_aItems.GetCount(); i++ ) m_aItems[i]->SetFont(font); + wxListBox::SetFont(font); + return TRUE; }