Added --use-stl to cnfigure, wxUSE_STL to setup0.h
Moved wx/datetime.inl contents to wx/datetime.h and removed inline redefinition hack. Implemented STL-like interface on top of wxList/wxArray, when wxUSE_STL=0. Implemented wxList-like and wxArray interfaces on top of std::list and std::vector, when wxUSE_STL=1. Added arrstr.h, moved wxArrayString declaration there; string.h #includes arrstr.h only if WXWIN_COMPATIBILITY_2_4 is enabled. Added WX_CLEAR_HASH_MAP, WX_CLEAR_HASH_TABLE, WX_CLEAR_LIST macros, to clear a wxHashMap, wxHashTable, wxList containing pointers: deletes pointers and makes container zero-sized. When wxUSE_STL=1, wxStringList works like a std::list<wxString>. Made wxBase compile when wxUSE_STL=1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
@@ -25,7 +25,8 @@
|
||||
#ifndef _WX_LISTH__
|
||||
#define _WX_LISTH__
|
||||
|
||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||
#if defined(__GNUG__) && !defined(__APPLE__) && \
|
||||
!(defined(__MINGW32__) && __GNUC__ == 3 && __GNUC_MINOR__ == 2)
|
||||
#pragma interface "list.h"
|
||||
#endif
|
||||
|
||||
@@ -37,25 +38,18 @@
|
||||
#include "wx/object.h"
|
||||
#include "wx/string.h"
|
||||
|
||||
class WXDLLIMPEXP_BASE wxObjectListNode;
|
||||
typedef wxObjectListNode wxNode;
|
||||
#if wxUSE_STL
|
||||
#include "wx/beforestd.h"
|
||||
#include <list>
|
||||
#include "wx/afterstd.h"
|
||||
#if defined(__WXMSW__) && defined(__MINGW32__)
|
||||
#include "wx/msw/winundef.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// undef it to get rid of old, deprecated functions
|
||||
#define wxLIST_COMPATIBILITY
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// constants
|
||||
// -----------------------------------------------------------------------------
|
||||
enum wxKeyType
|
||||
{
|
||||
wxKEY_NONE,
|
||||
wxKEY_INTEGER,
|
||||
wxKEY_STRING
|
||||
};
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// ----------------------------------------------------------------------------
|
||||
// types
|
||||
// -----------------------------------------------------------------------------
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// type of compare function for list sort operation (as in 'qsort'): it should
|
||||
// return a negative value, 0 or positive value if the first element is less
|
||||
@@ -65,9 +59,183 @@ extern "C"
|
||||
typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);
|
||||
}
|
||||
|
||||
class WXDLLIMPEXP_BASE wxObjectListNode;
|
||||
typedef wxObjectListNode wxNode;
|
||||
|
||||
//
|
||||
typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if !defined(wxENUM_KEY_TYPE_DEFINED)
|
||||
#define wxENUM_KEY_TYPE_DEFINED
|
||||
|
||||
enum wxKeyType
|
||||
{
|
||||
wxKEY_NONE,
|
||||
wxKEY_INTEGER,
|
||||
wxKEY_STRING
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#if wxUSE_STL
|
||||
|
||||
#define wxLIST_COMPATIBILITY
|
||||
|
||||
#define WX_DECLARE_LIST_3(elT, dummy1, liT, dummy2, decl) \
|
||||
WX_DECLARE_LIST_X(elT, liT, decl)
|
||||
|
||||
#define WX_DECLARE_LIST_2(elT, liT, dummy, decl) \
|
||||
WX_DECLARE_LIST_X(elT, liT, decl)
|
||||
|
||||
#define WX_DECLARE_LIST_X(elT, liT, decl) \
|
||||
WX_DECLARE_LIST_XO(elT*, liT, decl)
|
||||
|
||||
#define WX_DECLARE_LIST_XO(elT, liT, decl) \
|
||||
decl liT : public std::list<elT> \
|
||||
{ \
|
||||
public: \
|
||||
class dummy; \
|
||||
\
|
||||
struct compatibility_iterator \
|
||||
{ \
|
||||
typedef std::list<elT>::iterator iterator; \
|
||||
iterator m_iter; \
|
||||
liT * m_list; \
|
||||
public: \
|
||||
operator bool() const \
|
||||
{ return m_list && m_iter != m_list->end(); } \
|
||||
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; } \
|
||||
}; \
|
||||
typedef struct compatibility_iterator citer; \
|
||||
\
|
||||
class dummy \
|
||||
{ \
|
||||
typedef std::list<elT>::iterator it; \
|
||||
typedef compatibility_iterator citer; \
|
||||
public: \
|
||||
elT GetData() const \
|
||||
{ \
|
||||
citer* i = (citer*)this; \
|
||||
return *(i->m_iter); \
|
||||
} \
|
||||
citer GetNext() const \
|
||||
{ \
|
||||
citer* i = (citer*)this; \
|
||||
it lit = i->m_iter; \
|
||||
return citer( i->m_list, ++lit ); \
|
||||
} \
|
||||
citer GetPrevious() const \
|
||||
{ \
|
||||
citer* i = (citer*)this; \
|
||||
it lit = i->m_iter; \
|
||||
return citer( i->m_list, ++lit ); \
|
||||
} \
|
||||
void SetData( elT e ) \
|
||||
{ \
|
||||
citer* i = (citer*)this; \
|
||||
*(i->m_iter) = e; \
|
||||
} \
|
||||
private: \
|
||||
dummy(); \
|
||||
}; \
|
||||
protected: \
|
||||
iterator find( elT e ) \
|
||||
{ \
|
||||
iterator it, en; \
|
||||
for( it = begin(), en = end(); it != en; ++it ) \
|
||||
if( *it == e ) \
|
||||
return it; \
|
||||
return it; \
|
||||
} \
|
||||
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 ) \
|
||||
{ \
|
||||
iterator it = find( e ); \
|
||||
if( it != end() ) \
|
||||
{ \
|
||||
erase( it ); \
|
||||
return true; \
|
||||
} \
|
||||
return false; \
|
||||
} \
|
||||
void Erase( const compatibility_iterator& it ) \
|
||||
{ \
|
||||
erase( it.m_iter ); \
|
||||
} \
|
||||
citer Find( 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 \
|
||||
{ \
|
||||
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; \
|
||||
} \
|
||||
}
|
||||
|
||||
#define WX_DECLARE_LIST(elementtype, listname) \
|
||||
WX_DECLARE_LIST_X(elementtype, listname, class)
|
||||
|
||||
#define WX_DECLARE_EXPORTED_LIST(elementtype, listname) \
|
||||
WX_DECLARE_LIST_X(elementtype, listname, class WXDLLEXPORT)
|
||||
|
||||
#define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo) \
|
||||
WX_DECLARE_LIST_X(elementtype, listname, class usergoo)
|
||||
|
||||
// this macro must be inserted in your program after
|
||||
// #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)
|
||||
#define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
|
||||
|
||||
#else // if !wxUSE_STL
|
||||
|
||||
// due to circular header dependencies this function has to be declared here
|
||||
// (normally it's found in utils.h which includes itself list.h...)
|
||||
extern WXDLLEXPORT wxChar* copystring(const wxChar *s);
|
||||
|
||||
class WXDLLEXPORT wxObjectListNode;
|
||||
typedef wxObjectListNode wxNode;
|
||||
|
||||
// undef it to get rid of old, deprecated functions
|
||||
#define wxLIST_COMPATIBILITY
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// key stuff: a list may be optionally keyed on integer or string key
|
||||
// -----------------------------------------------------------------------------
|
||||
@@ -169,7 +337,9 @@ protected:
|
||||
int IndexOf() const;
|
||||
|
||||
virtual void DeleteData() { }
|
||||
|
||||
public:
|
||||
// for wxList::iterator
|
||||
void** GetDataPtr() const { return &(((wxNodeBase*)this)->m_data); }
|
||||
private:
|
||||
// optional key stuff
|
||||
wxListKeyValue m_key;
|
||||
@@ -330,6 +500,10 @@ protected:
|
||||
void ForEach(wxListIterateFunction func);
|
||||
void *LastThat(wxListIterateFunction func);
|
||||
|
||||
// for STL interface, "last" points to one after the last node
|
||||
// of the controlled sequence (NULL for the end of the list)
|
||||
void Reverse();
|
||||
void DeleteNodes(wxNodeBase* first, wxNodeBase* last);
|
||||
private:
|
||||
// helpers
|
||||
// common part of copy ctor and assignment operator
|
||||
@@ -404,6 +578,7 @@ private:
|
||||
{ \
|
||||
public: \
|
||||
typedef nodetype Node; \
|
||||
typedef Node* compatibility_iterator; \
|
||||
\
|
||||
name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \
|
||||
{ } \
|
||||
@@ -447,6 +622,8 @@ private:
|
||||
{ return wxListBase::DeleteNode(node); } \
|
||||
bool DeleteObject(Tbase *object) \
|
||||
{ return wxListBase::DeleteObject(object); } \
|
||||
void Erase(compatibility_iterator it) \
|
||||
{ DeleteNode(it); } \
|
||||
\
|
||||
nodetype *Find(Tbase *object) const \
|
||||
{ return (nodetype *)wxListBase::Find(object); } \
|
||||
@@ -469,6 +646,275 @@ private:
|
||||
(nodetype *)prev, (nodetype *)next, \
|
||||
(T *)data, key); \
|
||||
} \
|
||||
/* STL interface */ \
|
||||
public: \
|
||||
typedef size_t size_type; \
|
||||
typedef int difference_type; \
|
||||
typedef T* value_type; \
|
||||
typedef Tbase* base_value_type; \
|
||||
typedef value_type& reference; \
|
||||
typedef const value_type& const_reference; \
|
||||
typedef base_value_type& base_reference; \
|
||||
typedef const base_value_type& const_base_reference; \
|
||||
\
|
||||
class iterator \
|
||||
{ \
|
||||
typedef name list; \
|
||||
public: \
|
||||
typedef list::Node Node; \
|
||||
typedef iterator itor; \
|
||||
typedef list::value_type* ptr_type; \
|
||||
\
|
||||
Node* m_node; \
|
||||
Node* m_init; \
|
||||
public: \
|
||||
typedef list::reference reference_type; \
|
||||
typedef ptr_type pointer_type; \
|
||||
\
|
||||
iterator(Node* node, Node* init) : m_node(node), m_init(init) {}\
|
||||
iterator() : m_node(NULL), m_init(NULL) { } \
|
||||
reference_type operator*() const \
|
||||
{ return *(pointer_type)m_node->GetDataPtr(); } \
|
||||
pointer_type operator->() const \
|
||||
{ return (pointer_type)m_node->GetDataPtr(); } \
|
||||
itor& operator++() { m_node = m_node->GetNext(); return *this; }\
|
||||
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) \
|
||||
{ \
|
||||
itor tmp = *this; \
|
||||
m_node = m_node ? m_node->GetPrevious() : m_init; \
|
||||
return tmp; \
|
||||
} \
|
||||
bool operator!=(const itor& it) const \
|
||||
{ return it.m_node != m_node; } \
|
||||
bool operator==(const itor& it) const \
|
||||
{ return it.m_node == m_node; } \
|
||||
}; \
|
||||
class const_iterator \
|
||||
{ \
|
||||
typedef name list; \
|
||||
public: \
|
||||
typedef list::Node Node; \
|
||||
typedef const_iterator itor; \
|
||||
typedef list::value_type* ptr_type; \
|
||||
\
|
||||
Node* m_node; \
|
||||
Node* m_init; \
|
||||
public: \
|
||||
typedef list::const_reference reference_type; \
|
||||
typedef const ptr_type pointer_type; \
|
||||
\
|
||||
const_iterator(Node* node, Node* init) \
|
||||
: m_node(node), m_init(init) { } \
|
||||
const_iterator() : m_node(NULL), m_init(NULL) { } \
|
||||
const_iterator(const iterator& it) \
|
||||
: m_node(it.m_node), m_init(it.m_init) { } \
|
||||
reference_type operator*() const \
|
||||
{ return *(pointer_type)m_node->GetDataPtr(); } \
|
||||
pointer_type operator->() const \
|
||||
{ return (pointer_type)m_node->GetDataPtr(); } \
|
||||
itor& operator++() { m_node = m_node->GetNext(); return *this; }\
|
||||
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) \
|
||||
{ \
|
||||
itor tmp = *this; \
|
||||
m_node = m_node ? m_node->GetPrevious() : m_init; \
|
||||
return tmp; \
|
||||
} \
|
||||
bool operator!=(const itor& it) const \
|
||||
{ return it.m_node != m_node; } \
|
||||
bool operator==(const itor& it) const \
|
||||
{ return it.m_node == m_node; } \
|
||||
}; \
|
||||
class reverse_iterator \
|
||||
{ \
|
||||
typedef name list; \
|
||||
public: \
|
||||
typedef list::Node Node; \
|
||||
typedef reverse_iterator itor; \
|
||||
typedef list::value_type* ptr_type; \
|
||||
\
|
||||
Node* m_node; \
|
||||
Node* m_init; \
|
||||
public: \
|
||||
typedef list::reference reference_type; \
|
||||
typedef ptr_type pointer_type; \
|
||||
\
|
||||
reverse_iterator(Node* node, Node* init) \
|
||||
: m_node(node), m_init(init) { } \
|
||||
reverse_iterator() : m_node(NULL), m_init(NULL) { } \
|
||||
reference_type operator*() const \
|
||||
{ return *(pointer_type)m_node->GetDataPtr(); } \
|
||||
pointer_type operator->() const \
|
||||
{ return (pointer_type)m_node->GetDataPtr(); } \
|
||||
itor& operator++() \
|
||||
{ m_node = m_node->GetPrevious(); return *this; } \
|
||||
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) \
|
||||
{ \
|
||||
itor tmp = *this; \
|
||||
m_node = m_node ? m_node->GetNext() : m_init; \
|
||||
return tmp; \
|
||||
} \
|
||||
bool operator!=(const itor& it) const \
|
||||
{ return it.m_node != m_node; } \
|
||||
bool operator==(const itor& it) const \
|
||||
{ return it.m_node == m_node; } \
|
||||
}; \
|
||||
class const_reverse_iterator \
|
||||
{ \
|
||||
typedef name list; \
|
||||
public: \
|
||||
typedef list::Node Node; \
|
||||
typedef const_reverse_iterator itor; \
|
||||
typedef list::value_type* ptr_type; \
|
||||
\
|
||||
Node* m_node; \
|
||||
Node* m_init; \
|
||||
public: \
|
||||
typedef list::const_reference reference_type; \
|
||||
typedef const ptr_type pointer_type; \
|
||||
\
|
||||
const_reverse_iterator(Node* node, Node* init) \
|
||||
: m_node(node), m_init(init) { } \
|
||||
const_reverse_iterator() : m_node(NULL), m_init(NULL) { } \
|
||||
const_reverse_iterator(const reverse_iterator& it) \
|
||||
: m_node(it.m_node), m_init(it.m_init) { } \
|
||||
reference_type operator*() const \
|
||||
{ return *(pointer_type)m_node->GetDataPtr(); } \
|
||||
pointer_type operator->() const \
|
||||
{ return (pointer_type)m_node->GetDataPtr(); } \
|
||||
itor& operator++() \
|
||||
{ m_node = m_node->GetPrevious(); return *this; } \
|
||||
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) \
|
||||
{ \
|
||||
itor tmp = *this; \
|
||||
m_node = m_node ? m_node->GetNext() : m_init; \
|
||||
return tmp; \
|
||||
} \
|
||||
bool operator!=(const itor& it) const \
|
||||
{ return it.m_node != m_node; } \
|
||||
bool operator==(const itor& it) const \
|
||||
{ return it.m_node == m_node; } \
|
||||
}; \
|
||||
\
|
||||
wxEXPLICIT name(size_type n, const_reference v = value_type()) \
|
||||
{ assign(n, v); } \
|
||||
name(const_iterator first, const_iterator last) \
|
||||
{ assign(first, last); } \
|
||||
iterator begin() { return iterator(GetFirst(), GetLast()); } \
|
||||
const_iterator begin() const \
|
||||
{ return const_iterator(GetFirst(), GetLast()); } \
|
||||
iterator end() { return iterator(NULL, GetLast()); } \
|
||||
const_iterator end() const { return const_iterator(NULL, GetLast()); }\
|
||||
reverse_iterator rbegin() \
|
||||
{ return reverse_iterator(GetLast(), GetFirst()); } \
|
||||
const_reverse_iterator rbegin() const \
|
||||
{ return const_reverse_iterator(GetLast(), GetFirst()); } \
|
||||
reverse_iterator rend() { return reverse_iterator(NULL, GetFirst()); }\
|
||||
const_reverse_iterator rend() const \
|
||||
{ return const_reverse_iterator(NULL, GetFirst()); } \
|
||||
void resize(size_type n, value_type v = value_type()) \
|
||||
{ \
|
||||
if(n < size()) \
|
||||
for(; n < size(); pop_back()); \
|
||||
else if(n > size()) \
|
||||
for(; n > size(); push_back(v)); \
|
||||
} \
|
||||
size_type size() const { return GetCount(); } \
|
||||
size_type max_size() const { return INT_MAX; } \
|
||||
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(); } \
|
||||
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) \
|
||||
{ \
|
||||
clear(); \
|
||||
for(; first != last; ++first) \
|
||||
Append((const_base_reference)*first); \
|
||||
} \
|
||||
void assign(size_type n, const_reference v = value_type()) \
|
||||
{ \
|
||||
clear(); \
|
||||
for(size_type i = 0; i < n; ++i) \
|
||||
Append((const_base_reference)v); \
|
||||
} \
|
||||
iterator insert(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())\
|
||||
{ \
|
||||
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) \
|
||||
{ \
|
||||
for(; first != last; ++first) \
|
||||
Insert(it.m_node, (const_base_reference)*first); \
|
||||
} \
|
||||
iterator erase(iterator it) \
|
||||
{ \
|
||||
iterator next = iterator(it.m_node->GetNext(), GetLast()); \
|
||||
DeleteNode(it.m_node); return next; \
|
||||
} \
|
||||
iterator erase(iterator first, 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) \
|
||||
{ insert(it, first, last); l.erase(first, last); } \
|
||||
void splice(iterator it, name& l) \
|
||||
{ splice(it, l, l.begin(), l.end() ); } \
|
||||
void splice(iterator it, name& l, iterator first) \
|
||||
{ \
|
||||
iterator tmp = first; ++tmp; \
|
||||
if(it == first || it == tmp) return; \
|
||||
insert(it, *first); \
|
||||
l.erase(first); \
|
||||
} \
|
||||
void remove(const_reference v) \
|
||||
{ DeleteObject((const_base_reference)v); } \
|
||||
void reverse() \
|
||||
{ Reverse(); } \
|
||||
/* void swap(name& l) \
|
||||
{ \
|
||||
{ size_t t = m_count; m_count = l.m_count; l.m_count = t; } \
|
||||
{ bool t = m_destroy; m_destroy = l.m_destroy; l.m_destroy = t; }\
|
||||
{ wxNodeBase* t = m_nodeFirst; m_nodeFirst = l.m_nodeFirst; l.m_nodeFirst = t; }\
|
||||
{ wxNodeBase* t = m_nodeLast; m_nodeLast = l.m_nodeLast; l.m_nodeLast = t; }\
|
||||
{ wxKeyType t = m_keyType; m_keyType = l.m_keyType; l.m_keyType = t; }\
|
||||
} */ \
|
||||
}
|
||||
|
||||
#define WX_DECLARE_LIST_2(elementtype, listname, nodename, classexp) \
|
||||
@@ -493,6 +939,7 @@ private:
|
||||
#define WX_DEFINE_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
|
||||
#define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
|
||||
|
||||
#endif // !wxUSE_STL
|
||||
|
||||
// =============================================================================
|
||||
// now we can define classes 100% compatible with the old ones
|
||||
@@ -510,37 +957,44 @@ private:
|
||||
// -----------------------------------------------------------------------------
|
||||
// wxList compatibility class: in fact, it's a list of wxObjects
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode, class WXDLLIMPEXP_BASE);
|
||||
|
||||
class WXDLLIMPEXP_BASE wxList : public wxObjectList
|
||||
{
|
||||
public:
|
||||
#ifdef wxWARN_COMPAT_LIST_USE
|
||||
#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STL
|
||||
wxDEPRECATED( wxList(int key_type = wxKEY_NONE) );
|
||||
#else
|
||||
#elif !wxUSE_STL
|
||||
wxList(int key_type = wxKEY_NONE);
|
||||
#endif
|
||||
|
||||
// this destructor is required for Darwin
|
||||
~wxList() { }
|
||||
|
||||
#if !wxUSE_STL
|
||||
wxList& operator=(const wxList& list)
|
||||
{ (void) wxListBase::operator=(list); return *this; }
|
||||
|
||||
// compatibility methods
|
||||
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
|
||||
#endif
|
||||
|
||||
#if wxUSE_STL
|
||||
#else
|
||||
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
|
||||
#endif
|
||||
|
||||
private:
|
||||
#if !wxUSE_STL
|
||||
DECLARE_DYNAMIC_CLASS(wxList)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if !wxUSE_STL
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// wxStringList class for compatibility with the old code
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
WX_DECLARE_LIST_2(wxChar, wxStringListBase, wxStringListNode, class WXDLLIMPEXP_BASE);
|
||||
|
||||
class WXDLLIMPEXP_BASE wxStringList : public wxStringListBase
|
||||
@@ -583,7 +1037,32 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxStringList)
|
||||
};
|
||||
|
||||
#else // if wxUSE_STL
|
||||
|
||||
WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLEXPORT);
|
||||
|
||||
class WXDLLEXPORT wxStringList : public wxStringListBase
|
||||
{
|
||||
public:
|
||||
};
|
||||
|
||||
#endif // wxUSE_STL
|
||||
|
||||
#endif // wxLIST_COMPATIBILITY
|
||||
|
||||
// delete all list elements
|
||||
//
|
||||
// NB: the class declaration of the list elements must be visible from the
|
||||
// place where you use this macro, otherwise the proper destructor may not
|
||||
// be called (a decent compiler should give a warning about it, but don't
|
||||
// count on it)!
|
||||
#define WX_CLEAR_LIST(type, list) \
|
||||
{ \
|
||||
type::iterator it, en; \
|
||||
for( it = (list).begin(), en = (list).end(); it != en; ++it ) \
|
||||
delete *it; \
|
||||
(list).clear(); \
|
||||
}
|
||||
|
||||
#endif
|
||||
// _WX_LISTH__
|
||||
|
||||
Reference in New Issue
Block a user