From 2e4b087e1cfd728ec6d91936d777219f42f8d837 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Mar 2006 16:19:48 +0000 Subject: [PATCH] reverted return type of wxList method to nodetype * from compatibility_iterator (undoing change of rev 1.103) because this breaks very old core relying on conversion of wxList::GetFirst() to wxNode* for example git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/list.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/wx/list.h b/include/wx/list.h index 904bdfc5ba..2539ab1c10 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -730,12 +730,12 @@ private: name& operator=(const name& list) \ { Assign(list); return *this; } \ \ - compatibility_iterator GetFirst() const \ + nodetype *GetFirst() const \ { return (nodetype *)wxListBase::GetFirst(); } \ - compatibility_iterator GetLast() const \ + nodetype *GetLast() const \ { return (nodetype *)wxListBase::GetLast(); } \ \ - compatibility_iterator Item(size_t index) const \ + nodetype *Item(size_t index) const \ { return (nodetype *)wxListBase::Item(index); } \ \ T *operator[](size_t index) const \ @@ -744,18 +744,18 @@ private: return node ? (T*)(node->GetData()) : (T*)NULL; \ } \ \ - compatibility_iterator Append(Tbase *object) \ + nodetype *Append(Tbase *object) \ { return (nodetype *)wxListBase::Append(object); } \ - compatibility_iterator Insert(Tbase *object) \ + nodetype *Insert(Tbase *object) \ { return (nodetype *)Insert((nodetype*)NULL, object); } \ - compatibility_iterator Insert(size_t pos, Tbase *object) \ + nodetype *Insert(size_t pos, Tbase *object) \ { return (nodetype *)wxListBase::Insert(pos, object); } \ - compatibility_iterator Insert(nodetype *prev, Tbase *object) \ + nodetype *Insert(nodetype *prev, Tbase *object) \ { return (nodetype *)wxListBase::Insert(prev, object); } \ \ - compatibility_iterator Append(long key, void *object) \ + nodetype *Append(long key, void *object) \ { return (nodetype *)wxListBase::Append(key, object); } \ - compatibility_iterator Append(const wxChar *key, void *object) \ + nodetype *Append(const wxChar *key, void *object) \ { return (nodetype *)wxListBase::Append(key, object); } \ \ nodetype *DetachNode(nodetype *node) \ @@ -764,10 +764,10 @@ private: { return wxListBase::DeleteNode(node); } \ bool DeleteObject(Tbase *object) \ { return wxListBase::DeleteObject(object); } \ - void Erase(compatibility_iterator it) \ + void Erase(nodetype *it) \ { DeleteNode(it); } \ \ - compatibility_iterator Find(const Tbase *object) const \ + nodetype *Find(const Tbase *object) const \ { return (nodetype *)wxListBase::Find(object); } \ \ virtual nodetype *Find(const wxListKey& key) const \ -- 2.45.2