X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/168da56b8f739937dd49e5ca864a76a3b0a7e99a..ccea21ccf8a8c7f2012c890c9c1b916d0e725db2:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index 5f8dcc4136..4a8541d372 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: list.h +// Name: wx/list.h // Purpose: wxList, wxStringList classes // Author: Julian Smart // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added @@ -25,11 +25,6 @@ #ifndef _WX_LISTH__ #define _WX_LISTH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && \ - !(defined(__MINGW32__) && __GNUC__ == 3 && __GNUC_MINOR__ == 2) -#pragma interface "list.h" -#endif - // ----------------------------------------------------------------------------- // headers // ----------------------------------------------------------------------------- @@ -116,7 +111,7 @@ private: #else // if defined( __VISUALC__ ) -#define WX_LIST_SORTFUNCTION( elT, f ) std::greater( f ) ) +#define WX_LIST_SORTFUNCTION( elT, f ) std::greater( f ) #define VC6_WORKAROUND(elT, liT, decl) \ decl liT; \ \ @@ -140,28 +135,67 @@ private: #endif // defined( __VISUALC__ ) +/* + Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround + for mingw 3.2.3 compiler bug that prevents a static function of liT class + from being exported into dll. A minimal code snippet reproducing the bug: + + struct WXDLLEXPORT Foo + { + static void Bar(); + struct SomeInnerClass + { + friend class Foo; // comment this out to make it link + }; + ~Foo() + { + Bar(); + } + }; + + The program does not link under mingw_gcc 3.2.3 producing undefined + reference to Foo::Bar() function + + + Note 2: the EmptyList is needed to allow having a NULL pointer-like + invalid iterator. We used to use just an uninitialized iterator object + instead but this fails with some debug/checked versions of STL, notably the + glibc version activated with _GLIBCXX_DEBUG, so we need to have a separate + invalid iterator. + */ + +// the real wxList-class declaration #define WX_DECLARE_LIST_XO(elT, liT, decl) \ + decl _WX_LIST_HELPER_##liT \ + { \ + typedef elT _WX_LIST_ITEM_TYPE_##liT; \ + public: \ + static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X ); \ + }; \ + \ VC6_WORKAROUND(elT, liT, decl) \ decl liT : public std::list \ { \ private: \ + typedef std::list BaseListType; \ + static BaseListType EmptyList; \ + \ bool m_destroy; \ - private: \ - typedef elT _WX_LIST_ITEM_TYPE_##liT; \ - static void DeleteFunction( const _WX_LIST_ITEM_TYPE_##liT X ); \ + \ public: \ - class compatibility_iterator \ + decl compatibility_iterator \ { \ private: \ - /* Workaround for broken VC6 nested class name resolution */ \ - typedef std::list::iterator iterator; \ - friend class liT; \ - private: \ + /* Workaround for broken VC6 nested class name resolution */ \ + typedef std::list::iterator iterator; \ + friend class liT; \ + \ iterator m_iter; \ liT * m_list; \ + \ public: \ compatibility_iterator() \ - : m_iter(), m_list( NULL ) {} \ + : m_iter(EmptyList.end()), m_list( NULL ) {} \ compatibility_iterator( liT* li, iterator i ) \ : m_iter( i ), m_list( li ) {} \ compatibility_iterator( const liT* li, iterator i ) \ @@ -170,9 +204,13 @@ private: compatibility_iterator* operator->() { return this; } \ const compatibility_iterator* operator->() const { return this; } \ \ - bool operator==(const compatibility_iterator& i) \ - { return (m_list == i.m_list) && (m_iter == i.m_iter); } \ - bool operator!=(const compatibility_iterator& i) \ + bool operator==(const compatibility_iterator& i) const \ + { \ + wxASSERT_MSG( m_list && i.m_list, \ + _T("comparing invalid iterators is illegal") ); \ + return (m_list == i.m_list) && (m_iter == i.m_iter); \ + } \ + bool operator!=(const compatibility_iterator& i) const \ { return !( operator==( i ) ); } \ operator bool() const \ { return m_list ? m_iter != m_list->end() : false; } \ @@ -191,16 +229,16 @@ private: } \ compatibility_iterator GetPrevious() const \ { \ + if ( m_iter == m_list->begin() ) \ + return compatibility_iterator(); \ + \ iterator i = m_iter; \ return compatibility_iterator( m_list, --i ); \ } \ int IndexOf() const \ { \ - return m_list ? \ - m_iter != m_list->end() ? \ - std::distance( m_list->begin(), m_iter ) : \ - wxNOT_FOUND : \ - wxNOT_FOUND; \ + return *this ? std::distance( m_list->begin(), m_iter ) \ + : wxNOT_FOUND; \ } \ }; \ public: \ @@ -226,6 +264,11 @@ private: std::advance( i, idx ); \ return compatibility_iterator( this, i ); \ } \ + elT operator[](size_t idx) const \ + { \ + return Item(idx).GetData(); \ + } \ + \ compatibility_iterator GetFirst() const \ { \ return compatibility_iterator( this, \ @@ -270,7 +313,7 @@ private: void Erase( const compatibility_iterator& i ) \ { \ if ( m_destroy ) \ - DeleteFunction( i->GetData() ); \ + _WX_LIST_HELPER_##liT::DeleteFunction( i->GetData() ); \ erase( i.m_iter ); \ } \ bool DeleteNode( const compatibility_iterator& i ) \ @@ -289,13 +332,17 @@ private: void Clear() \ { \ if ( m_destroy ) \ - std::for_each( begin(), end(), DeleteFunction ); \ + std::for_each( begin(), end(), \ + _WX_LIST_HELPER_##liT::DeleteFunction ); \ clear(); \ } \ /* Workaround for broken VC6 std::list::sort() see above */ \ void Sort( wxSortCompareFunction compfunc ) \ { sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \ ~liT() { Clear(); } \ + \ + /* It needs access to our EmptyList */ \ + friend decl compatibility_iterator; \ } #define WX_DECLARE_LIST(elementtype, listname) \ @@ -314,7 +361,7 @@ private: WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) // this macro must be inserted in your program after -// #include +// #include "wx/listimpl.cpp" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) @@ -328,9 +375,6 @@ private: 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 @@ -461,9 +505,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) @@ -600,6 +642,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); @@ -672,6 +718,7 @@ private: void SetData(T *data) \ { wxNodeBase::SetData(data); } \ \ + protected: \ virtual void DeleteData(); \ \ DECLARE_NO_COPY_CLASS(nodetype) \ @@ -681,7 +728,17 @@ private: { \ public: \ typedef nodetype Node; \ - typedef Node* compatibility_iterator; \ + classexp compatibility_iterator \ + { \ + public: \ + compatibility_iterator(Node *ptr = NULL) : m_ptr(ptr) { } \ + \ + Node *operator->() const { return m_ptr; } \ + operator Node *() const { return m_ptr; } \ + \ + private: \ + Node *m_ptr; \ + }; \ \ name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \ { } \ @@ -727,7 +784,7 @@ private: { return wxListBase::DeleteNode(node); } \ bool DeleteObject(Tbase *object) \ { return wxListBase::DeleteObject(object); } \ - void Erase(compatibility_iterator it) \ + void Erase(nodetype *it) \ { DeleteNode(it); } \ \ nodetype *Find(const Tbase *object) const \ @@ -764,7 +821,7 @@ private: typedef base_value_type& base_reference; \ typedef const base_value_type& const_base_reference; \ \ - class iterator \ + classexp iterator \ { \ typedef name list; \ public: \ @@ -786,14 +843,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; \ @@ -804,7 +861,7 @@ private: bool operator==(const itor& it) const \ { return it.m_node == m_node; } \ }; \ - class const_iterator \ + classexp const_iterator \ { \ typedef name list; \ public: \ @@ -829,14 +886,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; \ @@ -847,7 +904,7 @@ private: bool operator==(const itor& it) const \ { return it.m_node == m_node; } \ }; \ - class reverse_iterator \ + classexp reverse_iterator \ { \ typedef name list; \ public: \ @@ -871,11 +928,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; \ @@ -886,7 +943,7 @@ private: bool operator==(const itor& it) const \ { return it.m_node == m_node; } \ }; \ - class const_reverse_iterator \ + classexp const_reverse_iterator \ { \ typedef name list; \ public: \ @@ -912,11 +969,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; \ @@ -930,7 +987,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 \ @@ -956,15 +1013,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) \ @@ -976,38 +1033,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; \ @@ -1069,7 +1126,7 @@ private: WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class usergoo) // this macro must be inserted in your program after -// #include +// #include "wx/listimpl.cpp" #define WX_DEFINE_LIST(name) "don't forget to include listimpl.cpp!" #define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name) @@ -1241,5 +1298,4 @@ public: (list).clear(); \ } -#endif - // _WX_LISTH__ +#endif // _WX_LISTH__