#ifndef _DYNARRAY_H
#define _DYNARRAY_H
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && \
- !(defined(__MINGW32__) && __GNUC__ == 3 && __GNUC_MINOR__ == 2)
-#pragma interface "dynarray.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_STL
void pop_back() { RemoveAt(size() - 1); } \
void push_back(const value_type& v) { Add(v); } \
void reserve(size_type n) { if(n > m_nSize) Realloc(n); } \
- void resize(size_type n, value_type v = value_type()); \
+ void resize(size_type n, value_type v = value_type()) \
+ { SetCount(n, v); } \
\
iterator begin() { return m_pItems; } \
iterator end() { return m_pItems + m_nCount; } \
int Index(T e, bool bFromEnd = false) const \
{ return base::Index(e, bFromEnd); } \
\
- void Add(T Item, size_t nInsert = 1) \
- { insert(end(), nInsert, Item); } \
- void Insert(T Item, size_t uiIndex, size_t nInsert = 1) \
- { insert(begin() + uiIndex, nInsert, Item); } \
+ void Add(T lItem, size_t nInsert = 1) \
+ { insert(end(), nInsert, lItem); } \
+ void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \
+ { insert(begin() + uiIndex, nInsert, lItem); } \
\
void RemoveAt(size_t uiIndex, size_t nRemove = 1) \
{ base::RemoveAt(uiIndex, nRemove); } \
- void Remove(T Item) \
- { int iIndex = Index(Item); \
+ void Remove(T lItem) \
+ { int iIndex = Index(lItem); \
wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \
_WX_ERROR_REMOVE); \
RemoveAt((size_t)iIndex); } \
T& Last() const \
{ return (T&)(base::operator[](Count() - 1)); } \
\
- int Index(T Item, bool bFromEnd = false) const \
- { return base::Index((base_type)Item, bFromEnd); } \
+ int Index(T lItem, bool bFromEnd = false) const \
+ { return base::Index((base_type)lItem, bFromEnd); } \
\
- void Add(T Item, size_t nInsert = 1) \
- { base::Add((base_type)Item, nInsert); } \
- void Insert(T Item, size_t uiIndex, size_t nInsert = 1) \
- { base::Insert((base_type)Item, uiIndex, nInsert) ; } \
+ void Add(T lItem, size_t nInsert = 1) \
+ { base::Add((base_type)lItem, nInsert); } \
+ void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \
+ { base::Insert((base_type)lItem, uiIndex, nInsert) ; } \
\
void RemoveAt(size_t uiIndex, size_t nRemove = 1) \
{ base::RemoveAt(uiIndex, nRemove); } \
- void Remove(T Item) \
- { int iIndex = Index(Item); \
+ void Remove(T lItem) \
+ { int iIndex = Index(lItem); \
wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \
_WX_ERROR_REMOVE); \
base::RemoveAt((size_t)iIndex); } \
{ reverse_iterator tmp = *this; --m_ptr; return tmp; } \
itor& operator--() { ++m_ptr; return *this; } \
const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\
- bool operator ==(const itor& it) { return m_ptr == it.m_ptr; } \
- bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \
+ bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\
+ bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
}; \
\
class const_reverse_iterator \
{ itor tmp = *this; --m_ptr; return tmp; } \
itor& operator--() { ++m_ptr; return *this; } \
const itor operator--(int) { itor tmp = *this; ++m_ptr; return tmp; }\
- bool operator ==(const itor& it) { return m_ptr == it.m_ptr; } \
- bool operator !=(const itor& it) { return m_ptr != it.m_ptr; } \
+ bool operator ==(const itor& it) const { return m_ptr == it.m_ptr; }\
+ bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
}; \
\
name(size_type n, const_reference v) { assign(n, v); } \
reverse_iterator rend() { return reverse_iterator(begin() - 1); } \
const_reverse_iterator rend() const; \
void reserve(size_type n) { base::reserve(n); }; \
- void resize(size_type n, value_type v = value_type()); \
+ void resize(size_type n, value_type v = value_type()) \
+ { base::resize(n, v); } \
}
#define _WX_PTROP pointer operator->() const { return m_ptr; }
T& Last() const \
{ return (T&)(base::operator[](size() - 1)); } \
\
- int Index(T Item) const \
- { return base::Index(Item, (CMPFUNC)m_fnCompare); } \
+ int Index(T lItem) const \
+ { return base::Index(lItem, (CMPFUNC)m_fnCompare); } \
\
- size_t IndexForInsert(T Item) const \
- { return base::IndexForInsert(Item, (CMPFUNC)m_fnCompare); } \
+ size_t IndexForInsert(T lItem) const \
+ { return base::IndexForInsert(lItem, (CMPFUNC)m_fnCompare); } \
\
void AddAt(T item, size_t index) \
{ base::insert(begin() + index, item); } \
\
- size_t Add(T Item) \
- { return base::Add(Item, (CMPFUNC)m_fnCompare); } \
+ size_t Add(T lItem) \
+ { return base::Add(lItem, (CMPFUNC)m_fnCompare); } \
\
void RemoveAt(size_t uiIndex, size_t nRemove = 1) \
{ base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \
- void Remove(T Item) \
- { int iIndex = Index(Item); \
+ void Remove(T lItem) \
+ { int iIndex = Index(lItem); \
wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \
_WX_ERROR_REMOVE ); \
base::erase(begin() + iIndex); } \
T& Last() const \
{ return *(T*)(base::operator[](size() - 1)); } \
\
- int Index(const T& Item, bool bFromEnd = false) const; \
+ int Index(const T& lItem, bool bFromEnd = false) const; \
\
- void Add(const T& Item, size_t nInsert = 1); \
+ void Add(const T& lItem, size_t nInsert = 1); \
void Add(const T* pItem) \
{ base::push_back((T*)pItem); } \
void push_back(const T* pItem) \
{ base::push_back((T*)pItem); } \
- void push_back(const T& Item) \
- { Add(Item); } \
+ void push_back(const T& lItem) \
+ { Add(lItem); } \
\
- void Insert(const T& Item, size_t uiIndex, size_t nInsert = 1); \
+ void Insert(const T& lItem, size_t uiIndex, size_t nInsert = 1); \
void Insert(const T* pItem, size_t uiIndex) \
{ base::insert(begin() + uiIndex, (T*)pItem); } \
\
// append all element of one array to another one
#define WX_APPEND_ARRAY(array, other) \
{ \
- size_t count = (other).size(); \
- for ( size_t n = 0; n < count; n++ ) \
+ size_t wxAAcnt = (other).size(); \
+ for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ ) \
{ \
- (array).push_back((other)[n]); \
+ (array).push_back((other)[wxAAn]); \
} \
}
// count on it)!
#define WX_CLEAR_ARRAY(array) \
{ \
- size_t count = (array).size(); \
- for ( size_t n = 0; n < count; n++ ) \
+ size_t wxAAcnt = (array).size(); \
+ for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ ) \
{ \
- delete (array)[n]; \
+ delete (array)[wxAAn]; \
} \
\
(array).clear(); \
projects / wxWidgets.git / blobdiff