X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1322419da01a8ba68c720fef65357433a330cf8..849a28d0da2d036a78c7252c2baa42e8aee8a65d:/include/wx/dynarray.h diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 1a7bf28d2f..6c64938d80 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -6,18 +6,26 @@ // Created: 12.09.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _DYNARRAY_H #define _DYNARRAY_H -#ifdef __GNUG__ +#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 + #include "wx/beforestd.h" + #include + #include + #include "wx/afterstd.h" +#endif + /* This header defines the dynamic arrays and object arrays (i.e. arrays which own their elements). Dynamic means that the arrays grow automatically as @@ -57,7 +65,7 @@ /* Callback compare function for quick sort. - + It must return negative value, 0 or positive value if the first item is less than, equal to or greater than the second one. */ @@ -76,9 +84,88 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2); // you cast "SomeArray *" as "BaseArray *" and then delete it) // ---------------------------------------------------------------------------- +#if wxUSE_STL + +template +class WXDLLIMPEXP_BASE wxArray_SortFunction +{ +public: + typedef int (wxCMPFUNC_CONV *CMPFUNC)(T* pItem1, T* pItem2); + + wxArray_SortFunction(CMPFUNC f) : m_f(f) { } + bool operator()(const T& i1, const T& i2) + { return m_f((T*)&i1, (T*)&i2) < 0; } +private: + CMPFUNC m_f; +}; + +template +class WXDLLIMPEXP_BASE wxSortedArray_SortFunction +{ +public: + typedef F CMPFUNC; + + wxSortedArray_SortFunction(CMPFUNC f) : m_f(f) { } + bool operator()(const T& i1, const T& i2) + { return m_f(i1, i2) < 0; } +private: + CMPFUNC m_f; +}; + +#define _WX_DECLARE_BASEARRAY(T, name, classexp) \ + typedef int (wxCMPFUNC_CONV *CMPFUN##name)(T pItem1, T pItem2); \ + typedef wxSortedArray_SortFunction name##_Predicate; \ + _WX_DECLARE_BASEARRAY_2(T, name, name##_Predicate, classexp) + +#define _WX_DECLARE_BASEARRAY_2(T, name, predicate, classexp) \ +classexp name : public std::vector \ +{ \ + typedef predicate Predicate; \ + typedef predicate::CMPFUNC SCMPFUNC; \ +public: \ + typedef wxArray_SortFunction::CMPFUNC CMPFUNC; \ +public: \ + void Empty() { clear(); } \ + void Clear() { clear(); } \ + void Alloc(size_t uiSize) { reserve(uiSize); } \ + void Shrink(); \ + \ + size_t GetCount() const { return size(); } \ + void SetCount(size_t n, T v = T()) { resize(n, v); } \ + bool IsEmpty() const { return empty(); } \ + size_t Count() const { return size(); } \ + \ + typedef T base_type; \ + \ +protected: \ + T& Item(size_t uiIndex) const \ + { wxASSERT( uiIndex < size() ); return (T&)operator[](uiIndex); } \ + \ + int Index(T e, bool bFromEnd = FALSE) const; \ + int Index(T lItem, CMPFUNC fnCompare) const; \ + size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const; \ + void Add(T lItem, size_t nInsert = 1) \ + { insert(end(), nInsert, lItem); } \ + size_t Add(T lItem, CMPFUNC fnCompare); \ + void Insert(T lItem, size_t uiIndex, size_t nInsert = 1) \ + { insert(begin() + uiIndex, nInsert, lItem); } \ + void Remove(T lItem); \ + void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ + { erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ + \ + void Sort(CMPFUNC fCmp) \ + { \ + wxArray_SortFunction p(fCmp); \ + std::sort(begin(), end(), p); \ + } \ +} + +#else // if !wxUSE_STL + #define _WX_DECLARE_BASEARRAY(T, name, classexp) \ classexp name \ { \ + typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STL */ \ public: \ name(); \ name(const name& array); \ @@ -90,11 +177,13 @@ public: \ void Alloc(size_t uiSize); \ void Shrink(); \ \ - size_t GetCount() const { return m_nCount; } \ - bool IsEmpty() const { return m_nCount == 0; } \ - size_t Count() const { return m_nCount; } \ + size_t GetCount() const { return m_nCount; } \ + void SetCount(size_t n, T defval = T(0)); \ + bool IsEmpty() const { return m_nCount == 0; } \ + size_t Count() const { return m_nCount; } \ \ typedef T base_type; \ + \ protected: \ T& Item(size_t uiIndex) const \ { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; } \ @@ -103,23 +192,71 @@ protected: \ int Index(T lItem, bool bFromEnd = FALSE) const; \ int Index(T lItem, CMPFUNC fnCompare) const; \ size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const; \ - void Add(T lItem); \ - void Add(T lItem, CMPFUNC fnCompare); \ - void Insert(T lItem, size_t uiIndex); \ + void Add(T lItem, size_t nInsert = 1); \ + size_t Add(T lItem, CMPFUNC fnCompare); \ + void Insert(T lItem, size_t uiIndex, size_t nInsert = 1); \ void Remove(T lItem); \ - void RemoveAt(size_t uiIndex); \ + void RemoveAt(size_t uiIndex, size_t nRemove = 1); \ \ void Sort(CMPFUNC fnCompare); \ \ -private: \ + /* *minimal* STL-ish interface, for derived classes */ \ + typedef T value_type; \ + typedef value_type* iterator; \ + typedef const value_type* const_iterator; \ + typedef value_type& reference; \ + typedef const value_type& const_reference; \ + typedef int difference_type; \ + typedef size_t size_type; \ \ - void Grow(); \ + void assign(const_iterator first, const_iterator last); \ + void assign(size_type n, const_reference v); \ + size_type capacity() const { return m_nSize; } \ + iterator erase(iterator first, iterator last) \ + { \ + size_type idx = first - begin(); \ + RemoveAt(idx, last - first); \ + return begin() + idx; \ + } \ + iterator erase(iterator it) { return erase(it, it + 1); } \ + void insert(iterator it, size_type n, const value_type& v) \ + { Insert(v, it - begin(), n); } \ + iterator insert(iterator it, const value_type& v = value_type()) \ + { \ + size_type idx = it - begin(); \ + Insert(v, idx); \ + return begin() + idx; \ + } \ + void insert(iterator it, const_iterator first, const_iterator last);\ + 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()); \ + \ + iterator begin() { return m_pItems; } \ + iterator end() { return m_pItems + m_nCount; } \ + const_iterator begin() const { return m_pItems; } \ + const_iterator end() const { return m_pItems + m_nCount; } \ + \ + /* the following functions may be made directly public because */ \ + /* they don't use the type of the elements at all */ \ +public: \ + void clear() { Clear(); } \ + bool empty() const { return IsEmpty(); } \ + size_type max_size() const { return INT_MAX; } \ + size_type size() const { return GetCount(); } \ + \ +private: \ + void Grow(size_t nIncrement = 0); \ + bool Realloc(size_t nSize); \ \ size_t m_nSize, \ m_nCount; \ \ T *m_pItems; \ -}; +} + +#endif // !wxUSE_STL // ============================================================================ // The private helper macros containing the core of the array classes @@ -142,7 +279,47 @@ private: \ // _WX_DEFINE_TYPEARRAY: array for simple types // ---------------------------------------------------------------------------- +#if wxUSE_STL + #define _WX_DEFINE_TYPEARRAY(T, name, base, classexp) \ +typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2); \ +classexp name : public base \ +{ \ +public: \ + T& operator[](size_t uiIndex) const \ + { return (T&)(base::operator[](uiIndex)); } \ + T& Item(size_t uiIndex) const \ + { return (T&)/*const cast*/base::operator[](uiIndex); } \ + T& Last() const \ + { return Item(Count() - 1); } \ + \ + 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 RemoveAt(size_t uiIndex, size_t nRemove = 1) \ + { base::RemoveAt(uiIndex, nRemove); } \ + void Remove(T Item) \ + { int iIndex = Index(Item); \ + wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ + _WX_ERROR_REMOVE); \ + RemoveAt((size_t)iIndex); } \ + \ + void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); } \ +} + +#define _WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base, classexp) \ + _WX_DEFINE_TYPEARRAY(T, name, base, classexp) + +#else // if !wxUSE_STL + +// common declaration used by both _WX_DEFINE_TYPEARRAY and +// _WX_DEFINE_TYPEARRAY_NO_PTR +#define _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, ptrop) \ wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ TypeTooBigToBeStoredIn##base, \ name); \ @@ -159,21 +336,22 @@ public: \ return *this; } \ \ T& operator[](size_t uiIndex) const \ - { return (T&)(base::Item(uiIndex)); } \ + { return (T&)(base::operator[](uiIndex)); } \ T& Item(size_t uiIndex) const \ - { return (T&)(base::Item(uiIndex)); } \ + { return (T&)(base::operator[](uiIndex)); } \ T& Last() const \ - { return (T&)(base::Item(Count() - 1)); } \ + { return (T&)(base::operator[](Count() - 1)); } \ \ int Index(T Item, bool bFromEnd = FALSE) const \ - { return base::Index(Item, bFromEnd); } \ + { return base::Index((base_type)Item, bFromEnd); } \ \ - void Add(T Item) \ - { base::Add(Item); } \ - void Insert(T Item, size_t uiIndex) \ - { base::Insert(Item, uiIndex) ; } \ + 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 RemoveAt(size_t uiIndex) { base::RemoveAt(uiIndex); } \ + void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ + { base::RemoveAt(uiIndex, nRemove); } \ void Remove(T Item) \ { int iIndex = Index(Item); \ wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ @@ -181,22 +359,148 @@ public: \ base::RemoveAt((size_t)iIndex); } \ \ void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); } \ + \ + /* STL-like interface */ \ +private: \ + typedef base::iterator biterator; \ + typedef base::const_iterator bconst_iterator; \ + typedef base::value_type bvalue_type; \ + typedef base::const_reference bconst_reference; \ +public: \ + typedef T value_type; \ + typedef value_type* pointer; \ + typedef const value_type* const_pointer; \ + typedef value_type* iterator; \ + typedef const value_type* const_iterator; \ + typedef value_type& reference; \ + typedef const value_type& const_reference; \ + typedef base::difference_type difference_type; \ + typedef base::size_type size_type; \ + \ + class reverse_iterator \ + { \ + typedef T value_type; \ + typedef value_type& reference; \ + typedef value_type* pointer; \ + typedef reverse_iterator itor; \ + friend inline itor operator+(int o, const itor& it) \ + { return it.m_ptr - o; } \ + friend inline itor operator+(const itor& it, int o) \ + { return it.m_ptr - o; } \ + friend inline itor operator-(const itor& it, int o) \ + { return it.m_ptr + o; } \ + friend inline difference_type operator-(const itor& i1, \ + const itor& i2) \ + { return i1.m_ptr - i2.m_ptr; } \ + \ + public: \ + pointer m_ptr; \ + reverse_iterator() : m_ptr(NULL) { } \ + reverse_iterator(pointer ptr) : m_ptr(ptr) { } \ + reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } \ + reference operator*() const { return *m_ptr; } \ + ptrop \ + itor operator++() { --m_ptr; return *this; } \ + itor operator++(int) \ + { reverse_iterator tmp = *this; --m_ptr; return tmp; } \ + itor operator--() { ++m_ptr; return *this; } \ + 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; } \ + }; \ + \ + class const_reverse_iterator \ + { \ + typedef T value_type; \ + typedef const value_type& reference; \ + typedef const value_type* pointer; \ + typedef const_reverse_iterator itor; \ + friend inline itor operator+(int o, const itor& it) \ + { return it.m_ptr - o; } \ + friend inline itor operator+(const itor& it, int o) \ + { return it.m_ptr - o; } \ + friend inline itor operator-(const itor& it, int o) \ + { return it.m_ptr + o; } \ + friend inline difference_type operator-(const itor& i1, \ + const itor& i2) \ + { return i1.m_ptr - i2.m_ptr; } \ + \ + public: \ + pointer m_ptr; \ + const_reverse_iterator() : m_ptr(NULL) { } \ + const_reverse_iterator(pointer ptr) : m_ptr(ptr) { } \ + const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { } \ + const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }\ + reference operator*() const { return *m_ptr; } \ + ptrop \ + itor operator++() { --m_ptr; return *this; } \ + itor operator++(int) \ + { itor tmp = *this; --m_ptr; return tmp; } \ + itor operator--() { ++m_ptr; return *this; } \ + 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; } \ + }; \ + \ + void assign(const_iterator first, const_iterator last) \ + { base::assign((bconst_iterator)first, (bconst_iterator)last); } \ + void assign(size_type n, const_reference v) \ + { base::assign(n, (bconst_reference)v); } \ + reference back() { return *(end() - 1); } \ + const_reference back() const { return *(end() - 1); } \ + iterator begin() { return (iterator)base::begin(); } \ + const_iterator begin() const { return (const_iterator)base::begin(); }\ + size_type capacity() const { return base::capacity(); } \ + iterator end() { return (iterator)base::end(); } \ + const_iterator end() const { return (const_iterator)base::end(); } \ + iterator erase(iterator first, iterator last) \ + { return (iterator)base::erase((biterator)first, (biterator)last); }\ + iterator erase(iterator it) \ + { return (iterator)base::erase((biterator)it); } \ + reference front() { return *begin(); } \ + const_reference front() const { return *begin(); } \ + void insert(iterator it, size_type n, const_reference v) \ + { base::insert((biterator)it, n, (bconst_reference)v); } \ + iterator insert(iterator it, const_reference v = value_type()) \ + { return (iterator)base::insert((biterator)it, (bconst_reference)v); }\ + void insert(iterator it, const_iterator first, const_iterator last) \ + { base::insert((biterator)it, (bconst_iterator)first, \ + (bconst_iterator)last); } \ + void pop_back() { base::pop_back(); } \ + void push_back(const_reference v) \ + { base::push_back((bconst_reference)v); } \ + reverse_iterator rbegin() { return reverse_iterator(end() - 1); } \ + const_reverse_iterator rbegin() const; \ + 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()); \ } +#define _WX_PTROP pointer operator->() const { return m_ptr; } +#define _WX_PTROP_NONE + +#define _WX_DEFINE_TYPEARRAY(T, name, base, classexp) \ + _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP) +#define _WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base, classexp) \ + _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE) + +#endif // !wxUSE_STL + // ---------------------------------------------------------------------------- // _WX_DEFINE_SORTED_TYPEARRAY: sorted array for simple data types // cannot handle types with size greater than pointer because of sorting // ---------------------------------------------------------------------------- -#define _WX_DEFINE_SORTED_TYPEARRAY(T, name, base, defcomp, classexp) \ -wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *), \ +#define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\ +wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type), \ TypeTooBigToBeStoredInSorted##base, \ name); \ -typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2); \ classexp name : public base \ { \ + typedef comptype SCMPFUNC; \ public: \ - name(SCMPFUNC##T fn defcomp) { m_fnCompare = fn; } \ + name(comptype fn defcomp) { m_fnCompare = fn; } \ \ name& operator=(const name& src) \ { base* temp = (base*) this; \ @@ -205,11 +509,11 @@ public: \ return *this; } \ \ T& operator[](size_t uiIndex) const \ - { return (T&)(base::Item(uiIndex)); } \ + { return (T&)(base::operator[](uiIndex)); } \ T& Item(size_t uiIndex) const \ - { return (T&)(base::Item(uiIndex)); } \ + { return (T&)(base::operator[](uiIndex)); } \ T& Last() const \ - { return (T&)(base::Item(Count() - 1)); } \ + { return (T&)(base::operator[](size() - 1)); } \ \ int Index(T Item) const \ { return base::Index(Item, (CMPFUNC)m_fnCompare); } \ @@ -218,31 +522,34 @@ public: \ { return base::IndexForInsert(Item, (CMPFUNC)m_fnCompare); } \ \ void AddAt(T item, size_t index) \ - { base::Insert(item, index); } \ + { base::insert(begin() + index, item); } \ \ - void Add(T Item) \ - { base::Add(Item, (CMPFUNC)m_fnCompare); } \ + size_t Add(T Item) \ + { return base::Add(Item, (CMPFUNC)m_fnCompare); } \ \ - void RemoveAt(size_t uiIndex) { base::RemoveAt(uiIndex); } \ + void RemoveAt(size_t uiIndex, size_t nRemove = 1) \ + { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); } \ void Remove(T Item) \ { int iIndex = Index(Item); \ wxCHECK2_MSG( iIndex != wxNOT_FOUND, return, \ _WX_ERROR_REMOVE ); \ - base::RemoveAt((size_t)iIndex); } \ + base::erase(begin() + iIndex); } \ \ private: \ - SCMPFUNC##T m_fnCompare; \ + comptype m_fnCompare; \ } + // ---------------------------------------------------------------------------- // _WX_DECLARE_OBJARRAY: an array for pointers to type T with owning semantics // ---------------------------------------------------------------------------- #define _WX_DECLARE_OBJARRAY(T, name, base, classexp) \ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T **pItem1, T **pItem2); \ -classexp name : public base \ +classexp name : protected base \ { \ typedef int (CMPFUNC_CONV *CMPFUNC##base)(void **pItem1, void **pItem2); \ +typedef base base_array; \ public: \ name() { } \ name(const name& src); \ @@ -250,30 +557,41 @@ public: \ \ ~name(); \ \ + void Alloc(size_t count) { reserve(count); } \ + size_t GetCount() const { return base_array::size(); } \ + size_t size() const { return base_array::size(); } \ + bool IsEmpty() const { return base_array::empty(); } \ + size_t Count() const { return base_array::size(); } \ + void Shrink() { base::Shrink(); } \ + \ T& operator[](size_t uiIndex) const \ - { return *(T*)base::Item(uiIndex); } \ + { return *(T*)base::operator[](uiIndex); } \ T& Item(size_t uiIndex) const \ - { return *(T*)base::Item(uiIndex); } \ + { return *(T*)base::operator[](uiIndex); } \ T& Last() const \ - { return *(T*)(base::Item(Count() - 1)); } \ + { return *(T*)(base::operator[](size() - 1)); } \ \ int Index(const T& Item, bool bFromEnd = FALSE) const; \ \ - void Add(const T& Item); \ + void Add(const T& Item, size_t nInsert = 1); \ void Add(const T* pItem) \ - { base::Add((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 Insert(const T& Item, size_t uiIndex); \ + void Insert(const T& Item, size_t uiIndex, size_t nInsert = 1); \ void Insert(const T* pItem, size_t uiIndex) \ - { base::Insert((T*)pItem, uiIndex); } \ + { base::insert(begin() + uiIndex, (T*)pItem); } \ \ - void Empty() { DoEmpty(); base::Empty(); } \ - void Clear() { DoEmpty(); base::Clear(); } \ + void Empty() { DoEmpty(); base::clear(); } \ + void Clear() { DoEmpty(); base::clear(); } \ \ T* Detach(size_t uiIndex) \ - { T* p = (T*)base::Item(uiIndex); \ - base::RemoveAt(uiIndex); return p; } \ - void RemoveAt(size_t uiIndex); \ + { T* p = (T*)base::operator[](uiIndex); \ + base::erase(begin() + uiIndex); return p; } \ + void RemoveAt(size_t uiIndex, size_t nRemove = 1); \ \ void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC##base)fCmp); } \ \ @@ -324,14 +642,30 @@ private: \ // ---------------------------------------------------------------------------- #define WX_DEFINE_TYPEARRAY(T, name, base) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, wxARRAY_DEFAULT_EXPORT) + WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class wxARRAY_DEFAULT_EXPORT) + +#define WX_DEFINE_TYPEARRAY_NO_PTR(T, name, base) \ + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT) #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLEXPORT) + WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT) -#define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \ - typedef T _wxArray##name; \ - _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, class expmode) +#define WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, base) \ + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class WXDLLEXPORT) + +#define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \ + WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl) + +#define WX_DEFINE_USER_EXPORTED_TYPEARRAY_NO_PTR(T, name, base, expdecl) \ + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, class expdecl) + +#define WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, classdecl) \ + typedef T _wxArray##name; \ + _WX_DEFINE_TYPEARRAY(_wxArray##name, name, base, classdecl) + +#define WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, base, classdecl) \ + typedef T _wxArray##name; \ + _WX_DEFINE_TYPEARRAY_NO_PTR(_wxArray##name, name, base, classdecl) // ---------------------------------------------------------------------------- // WX_DEFINE_SORTED_TYPEARRAY: this is the same as the previous macro, but it @@ -371,8 +705,9 @@ private: \ #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode) \ typedef T _wxArray##name; \ - _WX_DEFINE_SORTED_TYPEARRAY(_wxArray##name, name, base, \ - wxARRAY_EMPTY_CMP, class expmode) + typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \ + _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, \ + wxARRAY_EMPTY_CMP, class expmode, SCMPFUNC##name) // ---------------------------------------------------------------------------- // WX_DEFINE_SORTED_TYPEARRAY_CMP: exactly the same as above but the comparison @@ -397,8 +732,9 @@ private: \ #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \ expmode) \ typedef T _wxArray##name; \ - _WX_DEFINE_SORTED_TYPEARRAY(_wxArray##name, name, base, = cmpfunc, \ - class expmode) + typedef int (CMPFUNC_CONV *SCMPFUNC##name)(T pItem1, T pItem2); \ + _WX_DEFINE_SORTED_TYPEARRAY_2(_wxArray##name, name, base, = cmpfunc, \ + class expmode, SCMPFUNC##name) // ---------------------------------------------------------------------------- // WX_DECLARE_OBJARRAY(T, name): this macro generates a new array class @@ -446,9 +782,12 @@ private: \ #define WX_DECLARE_EXPORTED_OBJARRAY(T, name) \ WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT) -#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \ +#define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \ typedef T _wxObjArray##name; \ - _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, class expmode) + _WX_DECLARE_OBJARRAY(_wxObjArray##name, name, wxArrayPtrVoid, decl) + +#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, expmode) \ + WX_DECLARE_OBJARRAY_WITH_DECL(T, name, class expmode) // WX_DEFINE_OBJARRAY is going to be redefined when arrimpl.cpp is included, // try to provoke a human-understandable error if it used incorrectly. @@ -463,11 +802,12 @@ private: \ // Some commonly used predefined base arrays // ---------------------------------------------------------------------------- -WX_DECLARE_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid); -WX_DECLARE_EXPORTED_BASEARRAY(short, wxBaseArrayShort); -WX_DECLARE_EXPORTED_BASEARRAY(int, wxBaseArrayInt); -WX_DECLARE_EXPORTED_BASEARRAY(long, wxBaseArrayLong); -WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); +WX_DECLARE_USER_EXPORTED_BASEARRAY(const void *, wxBaseArrayPtrVoid, + WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(short, wxBaseArrayShort, WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(int, wxBaseArrayInt, WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(long, wxBaseArrayLong, WXDLLIMPEXP_BASE); +WX_DECLARE_USER_EXPORTED_BASEARRAY(double, wxBaseArrayDouble, WXDLLIMPEXP_BASE); // ---------------------------------------------------------------------------- // Convenience macros to define arrays from base arrays @@ -475,38 +815,46 @@ WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); #define WX_DEFINE_ARRAY(T, name) \ WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayPtrVoid) +#define WX_DEFINE_ARRAY_NO_PTR(T, name) \ + WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid) #define WX_DEFINE_EXPORTED_ARRAY(T, name) \ WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid) +#define WX_DEFINE_EXPORTED_ARRAY_NO_PTR(T, name) \ + WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayPtrVoid) +#define WX_DEFINE_ARRAY_WITH_DECL_NO_PTR(T, name, decl) \ + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayPtrVoid, decl) #define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, expmode) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayPtrVoid, expmode) + WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, wxBaseArrayPtrVoid, expmode) +#define WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(T, name, expmode) \ + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayPtrVoid, expmode) #define WX_DEFINE_ARRAY_SHORT(T, name) \ - WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayShort) + WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayShort) #define WX_DEFINE_EXPORTED_ARRAY_SHORT(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayShort) + WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayShort) #define WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(T, name, expmode) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayShort, expmode) + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayShort, expmode) #define WX_DEFINE_ARRAY_INT(T, name) \ - WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayInt) + WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayInt) #define WX_DEFINE_EXPORTED_ARRAY_INT(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayInt) + WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayInt) #define WX_DEFINE_USER_EXPORTED_ARRAY_INT(T, name, expmode) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayInt, expmode) + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayInt, expmode) #define WX_DEFINE_ARRAY_LONG(T, name) \ - WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayLong) + WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayLong) #define WX_DEFINE_EXPORTED_ARRAY_LONG(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayLong) + WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayLong) #define WX_DEFINE_USER_EXPORTED_ARRAY_LONG(T, name, expmode) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayLong, expmode) + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayLong, expmode) #define WX_DEFINE_ARRAY_DOUBLE(T, name) \ - WX_DEFINE_TYPEARRAY(T, name, wxBaseArrayDouble) + WX_DEFINE_TYPEARRAY_NO_PTR(T, name, wxBaseArrayDouble) #define WX_DEFINE_EXPORTED_ARRAY_DOUBLE(T, name) \ - WX_DEFINE_EXPORTED_TYPEARRAY(T, name, wxBaseArrayDouble) + WX_DEFINE_EXPORTED_TYPEARRAY_NO_PTR(T, name, wxBaseArrayDouble) #define WX_DEFINE_USER_EXPORTED_ARRAY_DOUBLE(T, name, expmode) \ - WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, wxBaseArrayDouble, expmode) + WX_DEFINE_TYPEARRAY_WITH_DECL_NO_PTR(T, name, wxBaseArrayDouble, expmode) // ---------------------------------------------------------------------------- // Convenience macros to define sorted arrays from base arrays @@ -584,10 +932,10 @@ WX_DECLARE_EXPORTED_BASEARRAY(double, wxBaseArrayDouble); // Some commonly used predefined arrays // ---------------------------------------------------------------------------- -WX_DEFINE_EXPORTED_ARRAY_SHORT (short, wxArrayShort); -WX_DEFINE_EXPORTED_ARRAY_INT (int, wxArrayInt); -WX_DEFINE_EXPORTED_ARRAY_LONG (long, wxArrayLong); -WX_DEFINE_EXPORTED_ARRAY (void *, wxArrayPtrVoid); +WX_DEFINE_USER_EXPORTED_ARRAY_SHORT(short, wxArrayShort, class WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY_INT(int, wxArrayInt, class WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY_LONG(long, wxArrayLong, class WXDLLIMPEXP_BASE); +WX_DEFINE_USER_EXPORTED_ARRAY_NO_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE); // ----------------------------------------------------------------------------- // convenience macros @@ -596,10 +944,10 @@ WX_DEFINE_EXPORTED_ARRAY (void *, wxArrayPtrVoid); // append all element of one array to another one #define WX_APPEND_ARRAY(array, other) \ { \ - size_t count = (other).Count(); \ + size_t count = (other).size(); \ for ( size_t n = 0; n < count; n++ ) \ { \ - (array).Add((other)[n]); \ + (array).push_back((other)[n]); \ } \ } @@ -611,13 +959,13 @@ WX_DEFINE_EXPORTED_ARRAY (void *, wxArrayPtrVoid); // count on it)! #define WX_CLEAR_ARRAY(array) \ { \ - size_t count = (array).Count(); \ + size_t count = (array).size(); \ for ( size_t n = 0; n < count; n++ ) \ { \ delete (array)[n]; \ } \ \ - (array).Empty(); \ + (array).clear(); \ } #endif // _DYNARRAY_H