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

If being asked to Add or Insert zero items just do nothing and return

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-09-24 00:35:08 +00:00
parent d9a149b1cc
commit d0c7b7d2b7
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/arrimpl.cpp
View File

@@ -75,6 +75,8 @@ void name::RemoveAt(size_t uiIndex, size_t nRemove) \
\ \
void name::Add(const T& item, size_t nInsert) \ void name::Add(const T& item, size_t nInsert) \
{ \ { \
if (nInsert == 0) \
return; \
T* pItem = new T(item); \ T* pItem = new T(item); \
size_t nOldSize = GetCount(); \ size_t nOldSize = GetCount(); \
if ( pItem != NULL ) \ if ( pItem != NULL ) \
@@ -85,6 +87,8 @@ void name::Add(const T& item, size_t nInsert) \
\ \
void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \ void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \
{ \ { \
if (nInsert == 0) \
return; \
T* pItem = new T(item); \ T* pItem = new T(item); \
if ( pItem != NULL ) \ if ( pItem != NULL ) \
wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert); \ wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert); \

4
src/common/dynarray.cpp
View File

@@ -253,6 +253,8 @@ int name::Index(T lItem, CMPFUNC fnCompare) const \
/* add item at the end */ \ /* add item at the end */ \
void name::Add(T lItem, size_t nInsert) \ void name::Add(T lItem, size_t nInsert) \
{ \ { \
if (nInsert == 0) \
return; \
Grow(nInsert); \ Grow(nInsert); \
for (size_t i = 0; i < nInsert; i++) \ for (size_t i = 0; i < nInsert; i++) \
m_pItems[m_nCount++] = lItem; \ m_pItems[m_nCount++] = lItem; \
@@ -271,6 +273,8 @@ void name::Insert(T lItem, size_t nIndex, size_t nInsert) \
wxCHECK_RET( m_nCount <= m_nCount + nInsert, \ wxCHECK_RET( m_nCount <= m_nCount + nInsert, \
wxT("array size overflow in wxArray::Insert") ); \ wxT("array size overflow in wxArray::Insert") ); \
\ \
if (nInsert == 0) \
return; \
Grow(nInsert); \ Grow(nInsert); \
\ \
memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \ memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \