X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..51072df23ffcf5bdd4651dbe0ad5143b1e360119:/src/os2/checklst.cpp diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index b11ed7c1f8..05f0b829f2 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -44,9 +44,7 @@ // implementation // ============================================================================ -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class @@ -271,7 +269,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, void wxCheckListBox::Delete(int N) { - wxCHECK_RET( N >= 0 && N < m_noItems, + wxCHECK_RET( N >= 0 && N < m_nNumItems, wxT("invalid index in wxListBox::Delete") ); wxListBox::Delete(N); @@ -279,12 +277,12 @@ 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) { - wxCHECK_RET( pos >= 0 && pos <= m_noItems, + wxCHECK_RET( pos >= 0 && pos <= m_nNumItems, wxT("invalid index in wxCheckListBox::InsertItems") ); wxListBox::InsertItems(nItems, items, pos); @@ -379,7 +377,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event) */ size_t nItem = 0; - if ( nItem < (size_t)m_noItems ) + if ( nItem < (size_t)m_nNumItems ) GetItem(nItem)->Toggle(); //else: it's not an error, just click outside of client zone }