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

added wxRTTI macros to wxList and wxStringList

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-06 01:38:08 +00:00
parent 0cf5b09998
commit f98bd52a3e
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/list.h
View File

@@ -186,6 +186,7 @@ private:
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// a double-linked list class // a double-linked list class
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
class WXDLLEXPORT wxListBase : public wxObject class WXDLLEXPORT wxListBase : public wxObject
{ {
friend class wxNodeBase; // should be able to call DetachNode() friend class wxNodeBase; // should be able to call DetachNode()
@@ -506,6 +507,9 @@ public:
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); } void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); } wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
private:
DECLARE_DYNAMIC_CLASS(wxList)
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -543,6 +547,8 @@ 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)
}; };
#endif // wxLIST_COMPATIBILITY #endif // wxLIST_COMPATIBILITY

13
src/common/list.cpp
View File

@@ -532,10 +532,18 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
delete[] objArray; delete[] objArray;
} }
// ============================================================================
// compatibility section from now on
// ============================================================================
#ifdef wxLIST_COMPATIBILITY
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// wxList (a.k.a. wxObjectList) // wxList (a.k.a. wxObjectList)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
void wxObjectListNode::DeleteData() void wxObjectListNode::DeleteData()
{ {
delete (wxObject *)GetData(); delete (wxObject *)GetData();
@@ -545,6 +553,8 @@ void wxObjectListNode::DeleteData()
// wxStringList // wxStringList
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
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()
@@ -670,3 +680,6 @@ void wxStringList::Sort()
delete [] array; delete [] array;
} }
#endif // wxLIST_COMPATIBILITY