From d0c7b7d2b70335cf31252807d456419dd8ef1460 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Sep 2002 00:35:08 +0000 Subject: [PATCH] If being asked to Add or Insert zero items just do nothing and return git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/arrimpl.cpp | 4 ++++ src/common/dynarray.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp index 8296608a01..46f94e5dab 100644 --- a/include/wx/arrimpl.cpp +++ b/include/wx/arrimpl.cpp @@ -75,6 +75,8 @@ void name::RemoveAt(size_t uiIndex, size_t nRemove) \ \ void name::Add(const T& item, size_t nInsert) \ { \ + if (nInsert == 0) \ + return; \ T* pItem = new T(item); \ size_t nOldSize = GetCount(); \ 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) \ { \ + if (nInsert == 0) \ + return; \ T* pItem = new T(item); \ if ( pItem != NULL ) \ wxBaseArrayPtrVoid::Insert(pItem, uiIndex, nInsert); \ diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index e8f7519f50..4d0ee51d28 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -253,6 +253,8 @@ int name::Index(T lItem, CMPFUNC fnCompare) const \ /* add item at the end */ \ void name::Add(T lItem, size_t nInsert) \ { \ + if (nInsert == 0) \ + return; \ Grow(nInsert); \ for (size_t i = 0; i < nInsert; i++) \ 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, \ wxT("array size overflow in wxArray::Insert") ); \ \ + if (nInsert == 0) \ + return; \ Grow(nInsert); \ \ memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \