X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eeb9e3d08f224fe910d493e1003b0443dc14706e..0bb0e26c0c82778a50e901acbc5e00f739435eef:/include/wx/list.h diff --git a/include/wx/list.h b/include/wx/list.h index dd16e615b5..97a965b246 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -40,6 +40,8 @@ #if wxUSE_STL #include "wx/beforestd.h" + #include + #include #include #include "wx/afterstd.h" #endif @@ -96,122 +98,183 @@ 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) \ +#define WX_DECLARE_LIST_XO(elT, liT, decl) \ + decl liT; \ + \ + /* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \ + /* to be passed into std::list::sort() */ \ + template <> \ + struct std::greater \ + { \ + private: \ + wxSortCompareFunction m_CompFunc; \ + public: \ + greater( wxSortCompareFunction compfunc = NULL ) \ + : m_CompFunc( compfunc ) {} \ + bool operator()(const elT X, const elT Y) const \ + { \ + return m_CompFunc ? \ + ( m_CompFunc( X, Y ) < 0 ) : \ + ( X > Y ); \ + } \ + }; \ + \ decl liT : public std::list \ { \ + private: \ + bool m_destroy; \ + private: \ + typedef elT _WX_LIST_ITEM_TYPE_##liT; \ + static void DeleteFunction( const _WX_LIST_ITEM_TYPE_##liT X ); \ public: \ - class dummy; \ - \ - struct compatibility_iterator \ + class compatibility_iterator \ { \ - typedef std::list::iterator iterator; \ + private: \ + /* Workaround for broken VC6 nested class name resolution */ \ + typedef std::list::iterator iterator; \ + friend class liT; \ + private: \ iterator m_iter; \ liT * m_list; \ public: \ + compatibility_iterator() \ + : m_iter(), m_list( NULL ) {} \ + compatibility_iterator( liT* li, iterator i ) \ + : m_iter( i ), m_list( li ) {} \ + compatibility_iterator( const liT* li, iterator i ) \ + : m_iter( i ), m_list( const_cast< liT* >( li ) ) {} \ + \ + 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) \ + { return !( operator==( i ) ); } \ operator bool() const \ - { return m_list && m_iter != m_list->end(); } \ + { return m_list ? m_iter != m_list->end() : false; } \ bool operator !() const \ - { return !m_list || m_iter == m_list->end(); } \ - compatibility_iterator( const liT* li, iterator it ) \ - : m_iter( it ), m_list( (liT*)li ) {} \ - compatibility_iterator( liT* li, iterator it ) \ - : m_iter( it ), m_list( li ) {} \ - compatibility_iterator() : m_list( NULL ) { } \ - dummy* operator->() { return (dummy*)this; } \ - const dummy* operator->() const { return (const dummy*)this; } \ - bool operator==(const compatibility_iterator& it) \ - { return m_list == it.m_list && m_iter == it.m_iter; } \ - bool operator!=(const compatibility_iterator& it) \ - { return m_list != it.m_list || m_iter != it.m_iter; } \ - }; \ - typedef struct compatibility_iterator citer; \ + { return !( operator bool() ); } \ \ - class dummy \ - { \ - typedef std::list::iterator it; \ - typedef compatibility_iterator citer; \ - public: \ elT GetData() const \ + { return *m_iter; } \ + void SetData( elT e ) \ + { *m_iter = e; } \ + \ + compatibility_iterator GetNext() const \ { \ - citer* i = (citer*)this; \ - return *(i->m_iter); \ + iterator i = m_iter; \ + return compatibility_iterator( m_list, ++i ); \ } \ - citer GetNext() const \ + compatibility_iterator GetPrevious() const \ { \ - citer* i = (citer*)this; \ - it lit = i->m_iter; \ - return citer( i->m_list, ++lit ); \ + iterator i = m_iter; \ + return compatibility_iterator( m_list, --i ); \ } \ - citer GetPrevious() const \ + int IndexOf() const \ { \ - citer* i = (citer*)this; \ - it lit = i->m_iter; \ - return citer( i->m_list, --lit ); \ + return m_list ? \ + m_iter != m_list->end() ? \ + std::distance( m_list->begin(), m_iter ) : \ + wxNOT_FOUND : \ + wxNOT_FOUND; \ } \ - void SetData( elT e ) \ - { \ - citer* i = (citer*)this; \ - *(i->m_iter) = e; \ - } \ - private: \ - dummy(); \ }; \ - protected: \ - iterator find( const elT e ) \ + public: \ + liT() : m_destroy( false ) {} \ + \ + compatibility_iterator Find( const elT e ) const \ { \ - iterator it, en; \ - for( it = begin(), en = end(); it != en; ++it ) \ - if( *it == e ) \ - return it; \ - return it; \ + liT* _this = const_cast< liT* >( this ); \ + return compatibility_iterator( _this, \ + std::find( _this->begin(), _this->end(), e ) ); \ } \ - public: \ - liT() {} \ \ - citer Append( elT e ) { push_back( e ); return GetLast(); } \ - void Clear() { clear(); } \ - size_t GetCount() const { return size(); } \ - citer GetFirst() const { return citer( this, ((liT*)this)->begin() ); } \ - citer GetLast() const { return citer( this, --(((liT*)this)->end()) ); } \ - bool IsEmpty() const { return empty(); } \ - bool DeleteObject( elT e ) \ + bool IsEmpty() const \ + { return empty(); } \ + size_t GetCount() const \ + { return size(); } \ + int Number() const \ + { return static_cast< int >( GetCount() ); } \ + \ + compatibility_iterator Item( size_t idx ) const \ + { \ + iterator i = const_cast< liT* >(this)->begin(); \ + std::advance( i, idx ); \ + return compatibility_iterator( this, i ); \ + } \ + compatibility_iterator GetFirst() const \ { \ - iterator it = find( e ); \ - if( it != end() ) \ + return compatibility_iterator( this, \ + const_cast< liT* >(this)->begin() ); \ + } \ + compatibility_iterator GetLast() const \ + { \ + iterator i = const_cast< liT* >(this)->end(); \ + return compatibility_iterator( this, !empty() ? --i : i ); \ + } \ + compatibility_iterator Member( elT e ) const \ + { return Find( e ); } \ + compatibility_iterator Nth( int n ) const \ + { return Item( n ); } \ + int IndexOf( elT e ) const \ + { return Find( e ).IndexOf(); } \ + \ + compatibility_iterator Append( elT e ) \ + { \ + push_back( e ); \ + return GetLast(); \ + } \ + compatibility_iterator Insert( elT e ) \ + { \ + push_front( e ); \ + return compatibility_iterator( this, begin() ); \ + } \ + compatibility_iterator Insert( compatibility_iterator & i, elT e ) \ + { \ + return compatibility_iterator( this, insert( i.m_iter, e ) ); \ + } \ + compatibility_iterator Insert( size_t idx, elT e ) \ + { \ + return compatibility_iterator( this, \ + insert( Item( idx ).m_iter, e ) ); \ + } \ + \ + void DeleteContents( bool destroy ) \ + { m_destroy = destroy; } \ + bool GetDeleteContents() const \ + { return m_destroy; } \ + void Erase( const compatibility_iterator& i ) \ + { \ + if ( m_destroy ) \ + DeleteFunction( i->GetData() ); \ + erase( i.m_iter ); \ + } \ + bool DeleteNode( const compatibility_iterator& i ) \ + { \ + if( i ) \ { \ - erase( it ); \ + Erase( i ); \ return true; \ } \ return false; \ } \ - void Erase( const compatibility_iterator& it ) \ + bool DeleteObject( elT e ) \ { \ - erase( it.m_iter ); \ + return DeleteNode( Find( e ) ); \ } \ - citer Find( const elT e ) const { return citer( this, ((liT*)this)->find( e ) ); } \ - citer Member( elT e ) const { return Find( e ); } \ - citer Insert( elT e ) \ - { push_front( e ); return citer( this, begin() ); } \ - citer Insert( size_t idx, elT e ) \ - { return Insert( Item( idx ), e ); } \ - citer Insert( citer idx, elT e ) \ - { return citer( this, insert( idx.m_iter, e ) ); } \ - citer Item( size_t idx ) const \ + void Clear() \ { \ - iterator it; \ - for( it = ((liT*)this)->begin(); idx; --idx ) \ - ++it; \ - return citer( this, it ); \ - } \ - int IndexOf( elT e ) const \ - { \ - const_iterator it, en; \ - int idx; \ - for( idx = 0, it = begin(), en = end(); it != en; ++it, ++idx ) \ - if( *it == e ) \ - return idx; \ - return wxNOT_FOUND; \ + if ( m_destroy ) \ + std::for_each( begin(), end(), DeleteFunction ); \ + clear(); \ } \ + \ + /* Workaround for broken VC6 std::list::sort() see above */ \ + void Sort( wxSortCompareFunction compfunc ) \ + { sort( std::greater( compfunc ) ); } \ + \ + ~liT() { Clear(); } \ } #define WX_DECLARE_LIST(elementtype, listname) \ @@ -307,7 +370,7 @@ private: // wxNodeBase class is a (base for) node in a double linked list // ----------------------------------------------------------------------------- -WXDLLIMPEXP_DATA_BASE(extern wxListKey) wxDefaultListKey; +extern WXDLLIMPEXP_DATA_BASE(wxListKey) wxDefaultListKey; class WXDLLIMPEXP_BASE wxListBase; @@ -371,7 +434,7 @@ private: // a double-linked list class // ----------------------------------------------------------------------------- -class wxList; +class WXDLLIMPEXP_BASE wxList; class WXDLLIMPEXP_BASE wxListBase : public wxObject { @@ -390,7 +453,7 @@ public: // count of items in the list size_t GetCount() const { return m_count; } - // return TRUE if this list is empty + // return true if this list is empty bool IsEmpty() const { return m_count == 0; } // operations @@ -446,11 +509,8 @@ public: wxListBase(void *object, ... /* terminate with NULL */); protected: - // copy ctor and assignment operator - wxListBase(const wxListBase& list) : wxObject() - { Init(); DoCopy(list); } - wxListBase& operator=(const wxListBase& list) - { Clear(); DoCopy(list); return *this; } + void Assign(const wxListBase& list) + { Clear(); DoCopy(list); } // get list head/tail wxNodeBase *GetFirst() const { return m_nodeFirst; } @@ -489,10 +549,10 @@ protected: // removes node from the list but doesn't delete it (returns pointer // to the node or NULL if it wasn't found in the list) wxNodeBase *DetachNode(wxNodeBase *node); - // delete element from list, returns FALSE if node not found + // delete element from list, returns false if node not found bool DeleteNode(wxNodeBase *node); // finds object pointer and deletes node (and object if DeleteContents - // is on), returns FALSE if object not found + // is on), returns false if object not found bool DeleteObject(void *object); // search (all return NULL if item not found) @@ -604,11 +664,13 @@ private: \ name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \ { } \ + name(const name& list) : wxListBase(list.GetKeyType()) \ + { Assign(list); } \ name(size_t count, T *elements[]) \ : wxListBase(count, (void **)elements) { } \ \ name& operator=(const name& list) \ - { (void) wxListBase::operator=(list); return *this; } \ + { Assign(list); return *this; } \ \ nodetype *GetFirst() const \ { return (nodetype *)wxListBase::GetFirst(); } \ @@ -656,8 +718,10 @@ private: int IndexOf(Tbase *object) const \ { return wxListBase::IndexOf(object); } \ \ + void Sort(wxSortCompareFunction func) \ + { wxListBase::Sort(func); } \ void Sort(wxSortFuncFor_##name func) \ - { wxListBase::Sort((wxSortCompareFunction)func); } \ + { Sort((wxSortCompareFunction)func); } \ \ protected: \ virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \ @@ -968,7 +1032,7 @@ private: #define WX_DECLARE_LIST_WITH_DECL(elementtype, listname, decl) \ typedef elementtype _WX_LIST_ITEM_TYPE_##listname; \ WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, decl) - + #define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \ WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLEXPORT) @@ -1090,20 +1154,20 @@ public: // copying the string list: the strings are copied, too (extremely // inefficient!) - wxStringList(const wxStringList& other) : wxStringListBase() { DeleteContents(TRUE); DoCopy(other); } + wxStringList(const wxStringList& other) : wxStringListBase() { DeleteContents(true); DoCopy(other); } wxStringList& operator=(const wxStringList& other) { Clear(); DoCopy(other); return *this; } // operations // makes a copy of the string wxNode *Add(const wxChar *s); - + // Append to beginning of list wxNode *Prepend(const wxChar *s); bool Delete(const wxChar *s); - wxChar **ListToArray(bool new_copies = FALSE) const; + wxChar **ListToArray(bool new_copies = false) const; bool Member(const wxChar *s) const; // alphabetic sort @@ -1117,9 +1181,9 @@ private: #else // if wxUSE_STL -WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLEXPORT); +WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLIMPEXP_BASE); -class WXDLLEXPORT wxStringList : public wxStringListBase +class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase { public: compatibility_iterator Append(wxChar* s)