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

Fixed wrong wxList<T>::compatibility_iterator::GetPrevious.

Browse Source 
Added operator== and != for compatibility_iterator.
  Removed deprecation warning of wxStringList: until wxPathList
is changed not to use wxStringList, having the warning is just
annoying.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-24 19:33:59 +00:00
parent 684d26bb27
commit 728c62b66d
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/list.h
View File

@@ -119,6 +119,10 @@ enum wxKeyType
compatibility_iterator() : m_list( NULL ) { } \ compatibility_iterator() : m_list( NULL ) { } \
dummy* operator->() { return (dummy*)this; } \ dummy* operator->() { return (dummy*)this; } \
const dummy* operator->() const { return (const 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; \ typedef struct compatibility_iterator citer; \
\ \
@@ -142,7 +146,7 @@ enum wxKeyType
{ \ { \
citer* i = (citer*)this; \ citer* i = (citer*)this; \
it lit = i->m_iter; \ it lit = i->m_iter; \
return citer( i->m_list, ++lit ); \ return citer( i->m_list, --lit ); \
} \ } \
void SetData( elT e ) \ void SetData( elT e ) \
{ \ { \
@@ -1030,7 +1034,8 @@ class WXDLLIMPEXP_BASE wxList : public wxObjectList
{ {
public: public:
#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STL #if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STL
wxDEPRECATED( wxList(int key_type = wxKEY_NONE) ); wxList() { };
wxDEPRECATED( wxList(int key_type) );
#elif !wxUSE_STL #elif !wxUSE_STL
wxList(int key_type = wxKEY_NONE); wxList(int key_type = wxKEY_NONE);
#endif #endif
@@ -1070,7 +1075,7 @@ public:
// ctors and such // ctors and such
// default // default
#ifdef wxWARN_COMPAT_LIST_USE #ifdef wxWARN_COMPAT_LIST_USE
wxDEPRECATED( wxStringList() ); wxStringList();
wxDEPRECATED( wxStringList(const wxChar *first ...) ); wxDEPRECATED( wxStringList(const wxChar *first ...) );
#else #else
wxStringList(); wxStringList();