X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/831c288955569b2e923f435154a0439c3dee979e..cbc855087fd939c5c480ef22b5f72b14302849b7:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index 97a965b246..82b0b0a3db 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -98,7 +98,26 @@ enum wxKeyType #define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \ WX_DECLARE_LIST_XO(elT*, liT, decl) -#define WX_DECLARE_LIST_XO(elT, liT, decl) \ +#if !defined( __VISUALC__ ) + +template +class WXDLLIMPEXP_BASE wxList_SortFunction +{ +public: + wxList_SortFunction(wxSortCompareFunction f) : m_f(f) { } + bool operator()(const T& i1, const T& i2) + { return m_f((T*)&i1, (T*)&i2) < 0; } +private: + wxSortCompareFunction m_f; +}; + +#define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction(f) +#define VC6_WORKAROUND(elT, liT, decl) + +#else // if defined( __VISUALC__ ) + +#define WX_LIST_SORTFUNCTION( elT, f ) std::greater( f ) +#define VC6_WORKAROUND(elT, liT, decl) \ decl liT; \ \ /* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \ @@ -117,8 +136,12 @@ enum wxKeyType ( m_CompFunc( X, Y ) < 0 ) : \ ( X > Y ); \ } \ - }; \ - \ + }; + +#endif // defined( __VISUALC__ ) + +#define WX_DECLARE_LIST_XO(elT, liT, decl) \ + VC6_WORKAROUND(elT, liT, decl) \ decl liT : public std::list \ { \ private: \ @@ -147,9 +170,9 @@ enum wxKeyType compatibility_iterator* operator->() { return this; } \ const compatibility_iterator* operator->() const { return this; } \ \ - bool operator==(const compatibility_iterator& i) \ + bool operator==(const compatibility_iterator& i) const \ { return (m_list == i.m_list) && (m_iter == i.m_iter); } \ - bool operator!=(const compatibility_iterator& i) \ + bool operator!=(const compatibility_iterator& i) const \ { return !( operator==( i ) ); } \ operator bool() const \ { return m_list ? m_iter != m_list->end() : false; } \ @@ -269,11 +292,9 @@ enum wxKeyType std::for_each( begin(), end(), DeleteFunction ); \ clear(); \ } \ - \ /* Workaround for broken VC6 std::list::sort() see above */ \ void Sort( wxSortCompareFunction compfunc ) \ - { sort( std::greater( compfunc ) ); } \ - \ + { sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \ ~liT() { Clear(); } \ } @@ -308,7 +329,6 @@ extern WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s); #endif class WXDLLEXPORT wxObjectListNode; -typedef wxObjectListNode wxNode; // undef it to get rid of old, deprecated functions #define wxLIST_COMPATIBILITY @@ -440,9 +460,7 @@ class WXDLLIMPEXP_BASE wxListBase : public wxObject { friend class WXDLLIMPEXP_BASE wxNodeBase; // should be able to call DetachNode() friend class wxHashTableBase; // should be able to call untyped Find() -private: - // common part of all ctors - void Init(wxKeyType keyType = wxKEY_NONE); // Must be declared before it's used (for VC++ 1.5) + public: // default ctor & dtor wxListBase(wxKeyType keyType = wxKEY_NONE) @@ -579,6 +597,10 @@ protected: void Reverse(); void DeleteNodes(wxNodeBase* first, wxNodeBase* last); private: + + // common part of all ctors + void Init(wxKeyType keyType = wxKEY_NONE); + // helpers // common part of copy ctor and assignment operator void DoCopy(const wxListBase& list); @@ -651,6 +673,7 @@ private: void SetData(T *data) \ { wxNodeBase::SetData(data); } \ \ + protected: \ virtual void DeleteData(); \ \ DECLARE_NO_COPY_CLASS(nodetype) \ @@ -765,14 +788,14 @@ private: { return *(pointer_type)m_node->GetDataPtr(); } \ ptrop \ itor& operator++() { m_node = m_node->GetNext(); return *this; }\ - itor operator++(int) \ + const itor operator++(int) \ { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }\ itor& operator--() \ { \ m_node = m_node ? m_node->GetPrevious() : m_init; \ return *this; \ } \ - itor operator--(int) \ + const itor operator--(int) \ { \ itor tmp = *this; \ m_node = m_node ? m_node->GetPrevious() : m_init; \ @@ -808,14 +831,14 @@ private: { return *(pointer_type)m_node->GetDataPtr(); } \ ptrop \ itor& operator++() { m_node = m_node->GetNext(); return *this; }\ - itor operator++(int) \ + const itor operator++(int) \ { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }\ itor& operator--() \ { \ m_node = m_node ? m_node->GetPrevious() : m_init; \ return *this; \ } \ - itor operator--(int) \ + const itor operator--(int) \ { \ itor tmp = *this; \ m_node = m_node ? m_node->GetPrevious() : m_init; \ @@ -850,11 +873,11 @@ private: ptrop \ itor& operator++() \ { m_node = m_node->GetPrevious(); return *this; } \ - itor operator++(int) \ + const itor operator++(int) \ { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }\ itor& operator--() \ { m_node = m_node ? m_node->GetNext() : m_init; return *this; } \ - itor operator--(int) \ + const itor operator--(int) \ { \ itor tmp = *this; \ m_node = m_node ? m_node->GetNext() : m_init; \ @@ -891,11 +914,11 @@ private: ptrop \ itor& operator++() \ { m_node = m_node->GetPrevious(); return *this; } \ - itor operator++(int) \ + const itor operator++(int) \ { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }\ itor& operator--() \ { m_node = m_node ? m_node->GetNext() : m_init; return *this;}\ - itor operator--(int) \ + const itor operator--(int) \ { \ itor tmp = *this; \ m_node = m_node ? m_node->GetNext() : m_init; \ @@ -909,7 +932,7 @@ private: \ wxEXPLICIT name(size_type n, const_reference v = value_type()) \ { assign(n, v); } \ - name(const_iterator first, const_iterator last) \ + name(const const_iterator& first, const const_iterator& last) \ { assign(first, last); } \ iterator begin() { return iterator(GetFirst(), GetLast()); } \ const_iterator begin() const \ @@ -935,15 +958,15 @@ private: bool empty() const { return IsEmpty(); } \ reference front() { return *begin(); } \ const_reference front() const { return *begin(); } \ - reference back() { return *--end(); } \ - const_reference back() const { return *--end(); } \ + reference back() { iterator tmp = end(); return *--tmp; } \ + const_reference back() const { const_iterator tmp = end(); return *--tmp; }\ void push_front(const_reference v = value_type()) \ { Insert(GetFirst(), (const_base_reference)v); } \ void pop_front() { DeleteNode(GetFirst()); } \ void push_back(const_reference v = value_type()) \ { Append((const_base_reference)v); } \ void pop_back() { DeleteNode(GetLast()); } \ - void assign(const_iterator first, const_iterator last) \ + void assign(const_iterator first, const const_iterator& last) \ { \ clear(); \ for(; first != last; ++first) \ @@ -955,38 +978,38 @@ private: for(size_type i = 0; i < n; ++i) \ Append((const_base_reference)v); \ } \ - iterator insert(iterator it, const_reference v = value_type()) \ + iterator insert(const iterator& it, const_reference v = value_type())\ { \ Insert(it.m_node, (const_base_reference)v); \ return iterator(it.m_node->GetPrevious(), GetLast()); \ } \ - void insert(iterator it, size_type n, const_reference v = value_type())\ + void insert(const iterator& it, size_type n, const_reference v = value_type())\ { \ for(size_type i = 0; i < n; ++i) \ Insert(it.m_node, (const_base_reference)v); \ } \ - void insert(iterator it, const_iterator first, const_iterator last) \ + void insert(const iterator& it, const_iterator first, const const_iterator& last)\ { \ for(; first != last; ++first) \ Insert(it.m_node, (const_base_reference)*first); \ } \ - iterator erase(iterator it) \ + iterator erase(const iterator& it) \ { \ iterator next = iterator(it.m_node->GetNext(), GetLast()); \ DeleteNode(it.m_node); return next; \ } \ - iterator erase(iterator first, iterator last) \ + iterator erase(const iterator& first, const iterator& last) \ { \ iterator next = last; ++next; \ DeleteNodes(first.m_node, last.m_node); \ return next; \ } \ void clear() { Clear(); } \ - void splice(iterator it, name& l, iterator first, iterator last) \ + void splice(const iterator& it, name& l, const iterator& first, const iterator& last)\ { insert(it, first, last); l.erase(first, last); } \ - void splice(iterator it, name& l) \ + void splice(const iterator& it, name& l) \ { splice(it, l, l.begin(), l.end() ); } \ - void splice(iterator it, name& l, iterator first) \ + void splice(const iterator& it, name& l, const iterator& first) \ { \ iterator tmp = first; ++tmp; \ if(it == first || it == tmp) return; \