#include <windows.h>
#include <windowsx.h>
-#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
-#include "wx/msw/gnuwin32/extra.h"
+#if defined(__GNUWIN32_OLD__)
+ #include "wx/msw/gnuwin32/extra.h"
#endif
// ----------------------------------------------------------------------------
// implementation
// ============================================================================
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
// ----------------------------------------------------------------------------
// declaration and implementation of wxCheckListBoxItem class
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));
// free memory
delete m_aItems[N];
- m_aItems.Remove(N);
-}
-
-void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
-{
- wxCHECK_RET( pos >= 0 && pos <= m_noItems,
- wxT("invalid index in wxCheckListBox::InsertItems") );
-
- wxListBox::InsertItems(nItems, items, pos);
-
- int i;
- 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);
- }
+ m_aItems.RemoveAt(N);
}
-
bool wxCheckListBox::SetFont( const wxFont &font )
{
size_t i;