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

diff --git a/include/wx/list.h b/include/wx/list.h
index d607fe330fbe200421386f5d8da83a9721b3c392..a76ad27d29acd8b860d954c9246ed53ebb0b3de3 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -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 wxHashTableBase;   // should be able to call untyped Find()
 {
 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
 #else
     wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
 #endif

-
-private:
-#if !wxUSE_STL
-    DECLARE_DYNAMIC_CLASS(wxList)
-#endif

 };
 
 #if !wxUSE_STL
 };
 
 #if !wxUSE_STL


@@ -1242,8 +1237,6 @@ public:
 
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=
 
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=

-
-    DECLARE_DYNAMIC_CLASS(wxStringList)

 };
 
 #else // if wxUSE_STL
 };
 
 #else // if wxUSE_STL

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 2c1fd19ad92dabd8a703508f382dba25b21f663b..15535b3552a7a47a698b796124b5bc47b18a30d5 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -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 )
     : wxObjectList( (wxKeyType)key_type )
 {
 wxList::wxList( int 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
 // ourselves
 void wxStringListNode::DeleteData()
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()