X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9467bdb7f5bfde9f99331097daacb93564ca122e..c13d6ac1ea199d1e3908d40d129e2fd5a4d82df7:/src/univ/checklst.cpp diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp index 95e1af791d..4e2d6f857c 100644 --- a/src/univ/checklst.cpp +++ b/src/univ/checklst.cpp @@ -57,8 +57,6 @@ public: // implementation of wxCheckListBox // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - // ---------------------------------------------------------------------------- // creation // ---------------------------------------------------------------------------- @@ -122,7 +120,7 @@ bool wxCheckListBox::Create(wxWindow *parent, bool wxCheckListBox::IsChecked(unsigned int item) const { wxCHECK_MSG( IsValid(item), false, - _T("invalid index in wxCheckListBox::IsChecked") ); + wxT("invalid index in wxCheckListBox::IsChecked") ); return m_checks[item] != 0; } @@ -130,7 +128,7 @@ bool wxCheckListBox::IsChecked(unsigned int item) const void wxCheckListBox::Check(unsigned int item, bool check) { wxCHECK_RET( IsValid(item), - _T("invalid index in wxCheckListBox::Check") ); + wxT("invalid index in wxCheckListBox::Check") ); // intermediate var is needed to avoid compiler warning with VC++ bool isChecked = m_checks[item] != 0; @@ -146,46 +144,16 @@ void wxCheckListBox::Check(unsigned int item, bool check) // methods forwarded to wxListBox // ---------------------------------------------------------------------------- -void wxCheckListBox::Delete(unsigned int n) +void wxCheckListBox::DoDeleteOneItem(unsigned int n) { - wxCHECK_RET( IsValid(n), _T("invalid index in wxListBox::Delete") ); - - wxListBox::Delete(n); + wxListBox::DoDeleteOneItem(n); m_checks.RemoveAt(n); } -int wxCheckListBox::DoAppend(const wxString& item) +void wxCheckListBox::OnItemInserted(unsigned int pos) { - int pos = wxListBox::DoAppend(item); - - // the item is initially unchecked m_checks.Insert(false, pos); - - return pos; -} - -void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) -{ - wxListBox::DoInsertItems(items, pos); - - unsigned int count = items.GetCount(); - for ( unsigned int n = 0; n < count; n++ ) - { - m_checks.Insert(false, pos + n); - } -} - -void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData) -{ - // call it first as it does DoClear() - wxListBox::DoSetItems(items, clientData); - - unsigned int count = items.GetCount(); - for ( unsigned int n = 0; n < count; n++ ) - { - m_checks.Add(false); - } } void wxCheckListBox::DoClear()