don't derive wxHtmlTag and wxHtmlTagsCache from wxObject, it's useless

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h
index 58d10054658a0e7102c0973b0cabe9ad4c16445e..e92bb40eba41a3ece5fed7354dbe720d87ae43da 100644 (file)
--- a/include/wx/html/htmltag.h
+++ b/include/wx/html/htmltag.h
@@ -27,10 +27,8 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;
 
 class wxHtmlTagsCacheData;
 
 
 class wxHtmlTagsCacheData;
 

-class WXDLLIMPEXP_HTML wxHtmlTagsCache : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlTagsCache

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache)
-

 private:
     wxHtmlTagsCacheData *m_Cache;
     size_t m_CachePos;
 private:
     wxHtmlTagsCacheData *m_Cache;
     size_t m_CachePos;


@@ -55,10 +53,8 @@ public:
 //                  by wxHtmlParser.
 //--------------------------------------------------------------------------------
 
 //                  by wxHtmlParser.
 //--------------------------------------------------------------------------------
 

-class WXDLLIMPEXP_HTML wxHtmlTag : public wxObject
+class WXDLLIMPEXP_HTML wxHtmlTag

 {
 {

-    DECLARE_CLASS(wxHtmlTag)
-

 protected:
     // constructs wxHtmlTag object based on HTML tag.
     // The tag begins (with '<' character) at position pos in source
 protected:
     // constructs wxHtmlTag object based on HTML tag.
     // The tag begins (with '<' character) at position pos in source


@@ -69,7 +65,7 @@ protected:
               wxHtmlEntitiesParser *entParser);
     friend class wxHtmlParser;
 public:
               wxHtmlEntitiesParser *entParser);
     friend class wxHtmlParser;
 public:

-    virtual ~wxHtmlTag();
+    ~wxHtmlTag();

 
     wxHtmlTag *GetParent() const {return m_Parent;}
     wxHtmlTag *GetFirstSibling() const;
 
     wxHtmlTag *GetParent() const {return m_Parent;}
     wxHtmlTag *GetFirstSibling() const;

diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index a468b0b00c7966b7b4f674248f8e38990a622501..a0f9b6af379ea5bd993cdb3ee02c385da76fc574 100644 (file)
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -54,8 +54,6 @@ class wxHtmlTagsCacheData : public wxVector<wxHtmlCacheItem>
 {
 };
 
 {
 };
 

-IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
-

 bool wxIsCDATAElement(const wxChar *tag)
 {
     return (wxStrcmp(tag, _T("SCRIPT")) == 0) ||
 bool wxIsCDATAElement(const wxChar *tag)
 {
     return (wxStrcmp(tag, _T("SCRIPT")) == 0) ||


@@ -230,12 +228,10 @@ void wxHtmlTagsCache::QueryTag(int at, int* end1, int* end2)
 // wxHtmlTag
 //-----------------------------------------------------------------------------
 
 // wxHtmlTag
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxHtmlTag,wxObject)
-

 wxHtmlTag::wxHtmlTag(wxHtmlTag *parent,
                      const wxString& source, int pos, int end_pos,
                      wxHtmlTagsCache *cache,
 wxHtmlTag::wxHtmlTag(wxHtmlTag *parent,
                      const wxString& source, int pos, int end_pos,
                      wxHtmlTagsCache *cache,

-                     wxHtmlEntitiesParser *entParser) : wxObject()
+                     wxHtmlEntitiesParser *entParser)

 {
     /* Setup DOM relations */
 
 {
     /* Setup DOM relations */