X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..058939fc084207e06d34a2c82f4c62a103516dd8:/src/common/dynarray.cpp?ds=sidebyside diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index c6ad4ae29d..bbf54265c4 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -17,14 +17,14 @@ #pragma implementation "dynarray.h" #endif -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #include "wx/dynarray.h" -#include +#include "wx/intl.h" #include #include // for memmove @@ -261,9 +261,9 @@ void wxBaseArray::Insert(long lItem, size_t nIndex) } // removes item from array (by index) -void wxBaseArray::Remove(size_t nIndex) +void wxBaseArray::RemoveAt(size_t nIndex) { - wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Remove") ); + wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::RemoveAt") ); memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1], (m_nCount - nIndex - 1)*sizeof(long)); @@ -278,7 +278,7 @@ void wxBaseArray::Remove(long lItem) wxCHECK_RET( iIndex != wxNOT_FOUND, wxT("removing inexistent item in wxArray::Remove") ); - Remove((size_t)iIndex); + RemoveAt((size_t)iIndex); } // sort array elements using passed comparaison function