Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for add/insert/deleting many items at once in wxArray (patch 548050)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-26 21:58:46 +00:00
parent f63e3ebbe3
commit 3b0b5f13f5
3 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/arrimpl.cpp
View File

@@ -63,27 +63,33 @@ void name::DoEmpty() \
delete (T*)wxBaseArrayPtrVoid::Item(ui); \
} \
\
void name::RemoveAt(size_t uiIndex) \
void name::RemoveAt(size_t uiIndex, size_t nRemove) \
{ \
wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) ); \
\
delete (T*)wxBaseArrayPtrVoid::Item(uiIndex); \
for (size_t i = 0; i < nRemove; i++ ) \
delete (T*)wxBaseArrayPtrVoid::Item(uiIndex + i); \
\
wxBaseArrayPtrVoid::RemoveAt(uiIndex); \
wxBaseArrayPtrVoid::RemoveAt(uiIndex, nRemove); \
} \
\
void name::Add(const T& item) \
void name::Add(const T& item, size_t nInsert) \
{ \
T* pItem = new T(item); \
size_t nOldSize = GetCount(); \
if ( pItem != NULL ) \
wxBaseArrayPtrVoid::Add(pItem, nInsert); \
for (size_t i = 1; i < nInsert; i++) \
wxBaseArrayPtrVoid::Item(nOldSize + i) = new T(item); \
} \
\
void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \
{ \
T* pItem = new T(item); \
if ( pItem != NULL ) \
Add(pItem); \
} \
\
void name::Insert(const T& item, size_t uiIndex) \
{ \
T* pItem = new T(item); \
if ( pItem != NULL ) \
Insert(pItem, uiIndex); \
wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert); \
for (size_t i = 1; i < nInsert; i++) \
wxBaseArrayPtrVoid::Item(uiIndex + i) = new T(item); \
} \
\
int name::Index(const T& Item, bool bFromEnd) const \