X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad9835c97c10c0d7de345e3a7a7c0fc2776eb2cb..a6794ed8e99b58b6bfa736e63aa80cfa68ac3034:/src/common/dynarray.cpp diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index ead8099c32..2157246df3 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -22,10 +22,9 @@ #ifndef WX_PRECOMP #include "wx/dynarray.h" + #include "wx/intl.h" #endif //WX_PRECOMP -#include "wx/intl.h" - #include #include // for memmove @@ -245,23 +244,6 @@ void name::Clear() \ wxDELETEA(m_pItems); \ } \ \ -/* pre-allocates memory (frees the previous data!) */ \ -void name::Alloc(size_t nSize) \ -{ \ - /* only if old buffer was not big enough */ \ - if ( nSize > m_nSize ) { \ - wxDELETEA(m_pItems); \ - m_nSize = 0; \ - m_pItems = new T[nSize]; \ - /* only alloc if allocation succeeded */ \ - if ( m_pItems ) { \ - m_nSize = nSize; \ - } \ - } \ - \ - m_nCount = 0; \ -} \ - \ /* minimizes the memory usage by freeing unused memory */ \ void name::Shrink() \ { \ @@ -421,6 +403,7 @@ void name::insert(iterator it, const_iterator first, const_iterator last) \ #endif _WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid) +_WX_DEFINE_BASEARRAY(char, wxBaseArrayChar) _WX_DEFINE_BASEARRAY(short, wxBaseArrayShort) _WX_DEFINE_BASEARRAY(int, wxBaseArrayInt) _WX_DEFINE_BASEARRAY(long, wxBaseArrayLong)