merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -165,7 +165,6 @@ void wxListBase::DoCopy(const wxListBase& list)
wxASSERT_MSG( !list.m_destroy,
wxT("copying list which owns it's elements is a bad idea") );
m_count = list.m_count;
m_destroy = list.m_destroy;
m_keyType = list.m_keyType;
m_nodeFirst =
@@ -204,6 +203,8 @@ void wxListBase::DoCopy(const wxListBase& list)
break;
}
}
wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
}
wxListBase::~wxListBase()