Made wxList::compatibility_iterator a class in wxUSE_STL == 0 case too instead
of a simple typedef to "Node *" to be able to initialize it with NULL in ctor which makes the behaviour of the code with and without wxUSE_STL the same. The price to pay is that the code like wxList:compatibility_iterator ci; ci = cond ? list->GetFirst() : wxList::compatibility_iterator(); doesn't compile any more and has to be replaced with (more clear anyhow) wxList:compatibility_iterator ci; if ( cond ) ci = list->GetFirst(); git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -680,7 +680,17 @@ private:
|
||||
{ \
|
||||
public: \
|
||||
typedef nodetype Node; \
|
||||
typedef Node* compatibility_iterator; \
|
||||
class compatibility_iterator \
|
||||
{ \
|
||||
public: \
|
||||
compatibility_iterator(Node *ptr = NULL) : m_ptr(ptr) { } \
|
||||
\
|
||||
Node *operator->() const { return m_ptr; } \
|
||||
operator Node *() const { return m_ptr; } \
|
||||
\
|
||||
private: \
|
||||
Node *m_ptr; \
|
||||
}; \
|
||||
\
|
||||
name(wxKeyType keyType = wxKEY_NONE) : wxListBase(keyType) \
|
||||
{ } \
|
||||
|
Reference in New Issue
Block a user