#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/window.h"
-#include "wx/listbox.h"
-#include "wx/ownerdrw.h"
-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"
#include "wx/checklst.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/object.h"
+ #include "wx/log.h"
+ #include "wx/window.h"
+ #include "wx/dcmemory.h"
+ #include "wx/dcscreen.h"
+ #include "wx/settings.h"
+ #include "wx/listbox.h"
+ #include "wx/bitmap.h"
+ #include "wx/colour.h"
+ #include "wx/font.h"
+#endif
+
+#include "wx/os2/dc.h"
+#include "wx/ownerdrw.h"
#define INCL_PM
#include <os2.h>
{
wxRect vRect = rRect;
- ::WinQueryWindowRect( m_pParent->GetHWND(), &rDc.m_vRclPaint );
+
+ wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+ ::WinQueryWindowRect( m_pParent->GetHWND(), &impl->m_vRclPaint );
if (IsChecked())
eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked);
//
HBITMAP hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP, SBMP_MENUCHECK );
POINTL vPoint = {nX, nOldY + 3};
-
- ::WinDrawBitmap( rDc.GetHPS(),
+ wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+ ::WinDrawBitmap( impl->GetHPS(),
hChkBmp,
NULL,
&vPoint,
m_aItems.RemoveAt(n);
} // end of wxCheckListBox::Delete
-void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
-{
- // pos is validated in wxListBox
- wxListBox::DoInsertItems( items, pos );
- unsigned int n = items.GetCount();
- for (unsigned int i = 0; i < n; i++)
- {
- wxOwnerDrawn* pNewItem = CreateItem((size_t)(pos + i));
-
- pNewItem->SetName(items[i]);
- m_aItems.Insert(pNewItem, (size_t)(pos + i));
- ::WinSendMsg( (HWND)GetHWND(),
- LM_SETITEMHANDLE,
- (MPARAM)(i + pos),
- MPFROMP(pNewItem)
- );
- }
-} // end of wxCheckListBox::InsertItems
-
bool wxCheckListBox::SetFont ( const wxFont& rFont )
{
for (unsigned int i = 0; i < m_aItems.GetCount(); i++)