X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..ad05b1880e5b7047b1de265f48fb104f73564119:/src/common/list.cpp diff --git a/src/common/list.cpp b/src/common/list.cpp index 8c6d14fdba..e51c364021 100644 --- a/src/common/list.cpp +++ b/src/common/list.cpp @@ -17,7 +17,7 @@ // headers // ----------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "list.h" #endif @@ -345,7 +345,7 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const return (wxNodeBase *)NULL; } -wxNodeBase *wxListBase::Find(void *object) const +wxNodeBase *wxListBase::Find(const void *object) const { for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() ) { @@ -574,24 +574,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last) #ifdef wxLIST_COMPATIBILITY -// ----------------------------------------------------------------------------- -// wxNodeBase deprecated methods -// ----------------------------------------------------------------------------- - -wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); } -wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); } -wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); } - -// ----------------------------------------------------------------------------- -// wxListBase deprecated methods -// ----------------------------------------------------------------------------- - -int wxListBase::Number() const { return GetCount(); } -wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); } -wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); } -wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); } -wxListBase::operator wxList&() const { return *(wxList*)this; } - // ----------------------------------------------------------------------------- // wxList (a.k.a. wxObjectList) // -----------------------------------------------------------------------------