Made wxList no longer inherit from wxObject, no change in STL mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -489,7 +489,7 @@ private:
|
||||
|
||||
class WXDLLIMPEXP_FWD_BASE wxList;
|
||||
|
||||
class WXDLLIMPEXP_BASE wxListBase : public wxObject
|
||||
class WXDLLIMPEXP_BASE wxListBase
|
||||
{
|
||||
friend class wxNodeBase; // should be able to call DetachNode()
|
||||
friend class wxHashTableBase; // should be able to call untyped Find()
|
||||
@@ -1192,11 +1192,6 @@ public:
|
||||
#else
|
||||
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
|
||||
#endif
|
||||
|
||||
private:
|
||||
#if !wxUSE_STL
|
||||
DECLARE_DYNAMIC_CLASS(wxList)
|
||||
#endif
|
||||
};
|
||||
|
||||
#if !wxUSE_STL
|
||||
@@ -1242,8 +1237,6 @@ public:
|
||||
|
||||
private:
|
||||
void DoCopy(const wxStringList&); // common part of copy ctor and operator=
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxStringList)
|
||||
};
|
||||
|
||||
#else // if wxUSE_STL
|
||||
|
@@ -574,8 +574,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
|
||||
// wxList (a.k.a. wxObjectList)
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
|
||||
|
||||
wxList::wxList( int key_type )
|
||||
: wxObjectList( (wxKeyType)key_type )
|
||||
{
|
||||
@@ -596,8 +594,6 @@ static inline wxChar* MYcopystring(const wxChar* s)
|
||||
return wxStrcpy(copy, s);
|
||||
}
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
|
||||
|
||||
// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
|
||||
// ourselves
|
||||
void wxStringListNode::DeleteData()
|
||||
|
Reference in New Issue
Block a user