///////////////////////////////////////////////////////////////////////////////
-// Name: listimpl.cpp
+// Name: wx/arrimpl.cpp
// Purpose: helper file for implementation of dynamic lists
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 16.10.97
// RCS-ID: $Id$
// Copyright: (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
* 4) WX_DEFINE_OBJARRAY *
*****************************************************************************/
+// needed to resolve the conflict between global T and macro parameter T
+
+#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)
-#define _DEFINE_OBJARRAY(T, name) \
+#undef _DEFINE_OBJARRAY
+#define _DEFINE_OBJARRAY(T, name) \
name::~name() \
{ \
Empty(); \
\
void name::DoCopy(const name& src) \
{ \
- for ( uint ui = 0; ui < src.Count(); ui++ ) \
+ for ( size_t ui = 0; ui < src.size(); ui++ ) \
Add(src[ui]); \
} \
\
return *this; \
} \
\
-name::name(const name& src) \
+name::name(const name& src) : wxArrayPtrVoid() \
{ \
DoCopy(src); \
} \
\
-void name::Empty() \
+void name::DoEmpty() \
{ \
- for ( uint ui = 0; ui < Count(); ui++ ) \
- delete (T*)BaseArray::Item(ui); \
- \
- BaseArray::Clear(); \
+ for ( size_t ui = 0; ui < size(); ui++ ) \
+ delete (T*)base_array::operator[](ui); \
} \
\
-void name::Remove(uint uiIndex) \
+void name::RemoveAt(size_t uiIndex, size_t nRemove) \
{ \
- wxCHECK( uiIndex < Count() ); \
+ wxCHECK_RET( uiIndex < size(), _WX_ERROR_REMOVE2(name) ); \
\
- delete (T*)BaseArray::Item(uiIndex); \
+ for (size_t i = 0; i < nRemove; i++ ) \
+ delete (T*)base_array::operator[](uiIndex + i); \
\
- BaseArray::Remove(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, uint 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 \
+int name::Index(const T& Item, bool bFromEnd) const \
{ \
if ( bFromEnd ) { \
- if ( Count() > 0 ) { \
- uint ui = Count() - 1; \
+ if ( size() > 0 ) { \
+ size_t ui = size() - 1; \
do { \
- if ( (T*)BaseArray::Item(ui) == &Item ) \
- return ui; \
+ if ( (T*)base_array::operator[](ui) == &Item ) \
+ return static_cast<int>(ui); \
ui--; \
} \
while ( ui != 0 ); \
} \
} \
else { \
- for( uint ui = 0; ui < Count(); ui++ ) { \
- if( (T*)BaseArray::Item(ui) == &Item ) \
- return ui; \
+ for( size_t ui = 0; ui < size(); ui++ ) { \
+ if( (T*)base_array::operator[](ui) == &Item ) \
+ return static_cast<int>(ui); \
} \
} \
\
- return NOT_FOUND; \
-}
+ return wxNOT_FOUND; \
+}
// redefine the macro so that now it will generate the class implementation
// old value would provoke a compile-time error if this file is not included
#undef WX_DEFINE_OBJARRAY
-#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_L##name, name)
-
-// don't pollute preprocessor's name space
-#undef _DEFINE_OBJARRAY
-
+#define WX_DEFINE_OBJARRAY(name) _DEFINE_OBJARRAY(_wxObjArray##name, name)
projects / wxWidgets.git / blobdiff