X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a931653f856e08fec7aa1e455a5a13fad311eb2..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/arrimpl.cpp?ds=sidebyside diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp index b16c18bded..bde7736639 100644 --- a/include/wx/arrimpl.cpp +++ b/include/wx/arrimpl.cpp @@ -22,12 +22,7 @@ // needed to resolve the conflict between global T and macro parameter T -// VC++ can't cope with string concatenation in Unicode mode -#if defined(wxUSE_UNICODE) && wxUSE_UNICODE -#define _WX_ERROR_REMOVE2(x) wxT("bad index in ::RemoveAt()") -#else -#define _WX_ERROR_REMOVE2(x) wxT("bad index in " #x "::RemoveAt()") -#endif +#define _WX_ERROR_REMOVE2(x) wxT("bad index in ") wxT(#x) wxT("::RemoveAt()") // macro implements remaining (not inline) methods of template list // (it's private to this file) @@ -40,7 +35,7 @@ name::~name() \ \ void name::DoCopy(const name& src) \ { \ - for ( size_t ui = 0; ui < src.Count(); ui++ ) \ + for ( size_t ui = 0; ui < src.size(); ui++ ) \ Add(src[ui]); \ } \ \ @@ -52,57 +47,67 @@ name& name::operator=(const name& src) \ return *this; \ } \ \ -name::name(const name& src) \ +name::name(const name& src) : wxArrayPtrVoid() \ { \ DoCopy(src); \ } \ \ void name::DoEmpty() \ { \ - for ( size_t ui = 0; ui < Count(); ui++ ) \ - delete (T*)wxBaseArray::Item(ui); \ + for ( size_t ui = 0; ui < size(); ui++ ) \ + delete (T*)base_array::operator[](ui); \ } \ \ -void name::RemoveAt(size_t uiIndex) \ +void name::RemoveAt(size_t uiIndex, size_t nRemove) \ { \ - wxCHECK_RET( uiIndex < Count(), _WX_ERROR_REMOVE2(name) ); \ + wxCHECK_RET( uiIndex < size(), _WX_ERROR_REMOVE2(name) ); \ \ - delete (T*)wxBaseArray::Item(uiIndex); \ + for (size_t i = 0; i < nRemove; i++ ) \ + delete (T*)base_array::operator[](uiIndex + i); \ \ - wxBaseArray::RemoveAt(uiIndex); \ + base_array::erase(begin() + uiIndex, begin() + uiIndex + nRemove); \ } \ \ -void name::Add(const T& item) \ +void name::Add(const T& item, size_t nInsert) \ { \ + if (nInsert == 0) \ + return; \ T* pItem = new T(item); \ + size_t nOldSize = size(); \ if ( pItem != NULL ) \ - Add(pItem); \ + base_array::insert(end(), nInsert, pItem); \ + for (size_t i = 1; i < nInsert; i++) \ + base_array::operator[](nOldSize + i) = new T(item); \ } \ \ -void name::Insert(const T& item, size_t uiIndex) \ +void name::Insert(const T& item, size_t uiIndex, size_t nInsert) \ { \ + if (nInsert == 0) \ + return; \ T* pItem = new T(item); \ if ( pItem != NULL ) \ - Insert(pItem, uiIndex); \ + base_array::insert(begin() + uiIndex, nInsert, pItem); \ + for (size_t i = 1; i < nInsert; i++) \ + base_array::operator[](uiIndex + i) = new T(item); \ } \ \ int name::Index(const T& Item, bool bFromEnd) const \ { \ if ( bFromEnd ) { \ - if ( Count() > 0 ) { \ - size_t ui = Count() - 1; \ + if ( size() > 0 ) { \ + size_t ui = size() - 1; \ do { \ - if ( (T*)wxBaseArray::Item(ui) == &Item ) \ - return ui; \ + if ( (T*)base_array::operator[](ui) == &Item ) \ + return wx_static_cast(int, ui); \ ui--; \ } \ while ( ui != 0 ); \ } \ } \ else { \ - for( size_t ui = 0; ui < Count(); ui++ ) { \ - if( (T*)wxBaseArray::Item(ui) == &Item ) \ - return ui; \ + for( size_t ui = 0; ui < size(); ui++ ) { \ + if( (T*)base_array::operator[](ui) == &Item ) \ + return wx_static_cast(int, ui); \ } \ } \ \