Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made wxList methods return compatibility_iterator instead of Node * to further reduce differences between wxUSE_STL==0 and 1 cases

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-22 19:14:28 +00:00
parent 80f218424f
commit d4d8988c72
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/list.h
View File

@@ -702,12 +702,12 @@ private:
name& operator=(const name& list) \ name& operator=(const name& list) \
{ Assign(list); return *this; } \ { Assign(list); return *this; } \
\ \
nodetype *GetFirst() const \ compatibility_iterator GetFirst() const \
{ return (nodetype *)wxListBase::GetFirst(); } \ { return (nodetype *)wxListBase::GetFirst(); } \
nodetype *GetLast() const \ compatibility_iterator GetLast() const \
{ return (nodetype *)wxListBase::GetLast(); } \ { return (nodetype *)wxListBase::GetLast(); } \
\ \
nodetype *Item(size_t index) const \ compatibility_iterator Item(size_t index) const \
{ return (nodetype *)wxListBase::Item(index); } \ { return (nodetype *)wxListBase::Item(index); } \
\ \
T *operator[](size_t index) const \ T *operator[](size_t index) const \
@@ -716,18 +716,18 @@ private:
return node ? (T*)(node->GetData()) : (T*)NULL; \ return node ? (T*)(node->GetData()) : (T*)NULL; \
} \ } \
\ \
nodetype *Append(Tbase *object) \ compatibility_iterator Append(Tbase *object) \
{ return (nodetype *)wxListBase::Append(object); } \ { return (nodetype *)wxListBase::Append(object); } \
nodetype *Insert(Tbase *object) \ compatibility_iterator Insert(Tbase *object) \
{ return (nodetype *)Insert((nodetype*)NULL, object); } \ { return (nodetype *)Insert((nodetype*)NULL, object); } \
nodetype *Insert(size_t pos, Tbase *object) \ compatibility_iterator Insert(size_t pos, Tbase *object) \
{ return (nodetype *)wxListBase::Insert(pos, object); } \ { return (nodetype *)wxListBase::Insert(pos, object); } \
nodetype *Insert(nodetype *prev, Tbase *object) \ compatibility_iterator Insert(nodetype *prev, Tbase *object) \
{ return (nodetype *)wxListBase::Insert(prev, object); } \ { return (nodetype *)wxListBase::Insert(prev, object); } \
\ \
nodetype *Append(long key, void *object) \ compatibility_iterator Append(long key, void *object) \
{ return (nodetype *)wxListBase::Append(key, object); } \ { return (nodetype *)wxListBase::Append(key, object); } \
nodetype *Append(const wxChar *key, void *object) \ compatibility_iterator Append(const wxChar *key, void *object) \
{ return (nodetype *)wxListBase::Append(key, object); } \ { return (nodetype *)wxListBase::Append(key, object); } \
\ \
nodetype *DetachNode(nodetype *node) \ nodetype *DetachNode(nodetype *node) \
@@ -739,7 +739,7 @@ private:
void Erase(compatibility_iterator it) \ void Erase(compatibility_iterator it) \
{ DeleteNode(it); } \ { DeleteNode(it); } \
\ \
nodetype *Find(const Tbase *object) const \ compatibility_iterator Find(const Tbase *object) const \
{ return (nodetype *)wxListBase::Find(object); } \ { return (nodetype *)wxListBase::Find(object); } \
\ \
virtual nodetype *Find(const wxListKey& key) const \ virtual nodetype *Find(const wxListKey& key) const \

6
src/common/list.cpp
View File

@@ -742,12 +742,14 @@ void wxStringList::Sort()
wxNode *wxStringList::Add(const wxChar *s) wxNode *wxStringList::Add(const wxChar *s)
{ {
return (wxNode *)wxStringListBase::Append(MYcopystring(s)); return (wxNode *)(wxStringListBase::Node *)
wxStringListBase::Append(MYcopystring(s));
} }
wxNode *wxStringList::Prepend(const wxChar *s) wxNode *wxStringList::Prepend(const wxChar *s)
{ {
return (wxNode *)wxStringListBase::Insert(MYcopystring(s)); return (wxNode *)(wxStringListBase::Node *)
wxStringListBase::Insert(MYcopystring(s));
} }
#endif // wxLIST_COMPATIBILITY #endif // wxLIST_COMPATIBILITY