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

Made wxList no longer inherit from wxObject, no change in STL mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-10-13 22:00:10 +00:00
parent 9a0a58f5af
commit 7e59e3d050
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/list.h
View File

@@ -489,7 +489,7 @@ private:
class WXDLLIMPEXP_FWD_BASE wxList; 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 wxNodeBase; // should be able to call DetachNode()
friend class wxHashTableBase; // should be able to call untyped Find() friend class wxHashTableBase; // should be able to call untyped Find()
@@ -1192,11 +1192,6 @@ public:
#else #else
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); } wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
#endif #endif
private:
#if !wxUSE_STL
DECLARE_DYNAMIC_CLASS(wxList)
#endif
}; };
#if !wxUSE_STL #if !wxUSE_STL
@@ -1242,8 +1237,6 @@ public:
private: private:
void DoCopy(const wxStringList&); // common part of copy ctor and operator= void DoCopy(const wxStringList&); // common part of copy ctor and operator=
DECLARE_DYNAMIC_CLASS(wxStringList)
}; };
#else // if wxUSE_STL #else // if wxUSE_STL

4
src/common/list.cpp
View File

@@ -574,8 +574,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
// wxList (a.k.a. wxObjectList) // wxList (a.k.a. wxObjectList)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
wxList::wxList( int key_type ) wxList::wxList( int key_type )
: wxObjectList( (wxKeyType)key_type ) : wxObjectList( (wxKeyType)key_type )
{ {
@@ -596,8 +594,6 @@ static inline wxChar* MYcopystring(const wxChar* s)
return wxStrcpy(copy, s); return wxStrcpy(copy, s);
} }
IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
// instead of WX_DEFINE_LIST(wxStringListBase) we define this function // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
// ourselves // ourselves
void wxStringListNode::DeleteData() void wxStringListNode::DeleteData()