From 7da48d4928ed18be8b84fe2b87bbb3780167dcf6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 22 Aug 2007 08:46:01 +0000 Subject: [PATCH] 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 --- include/wx/html/htmltag.h | 10 +++------- src/html/htmltag.cpp | 6 +----- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 58d1005465..e92bb40eba 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -27,10 +27,8 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser; class wxHtmlTagsCacheData; -class WXDLLIMPEXP_HTML wxHtmlTagsCache : public wxObject +class WXDLLIMPEXP_HTML wxHtmlTagsCache { - DECLARE_DYNAMIC_CLASS(wxHtmlTagsCache) - private: wxHtmlTagsCacheData *m_Cache; size_t m_CachePos; @@ -55,10 +53,8 @@ public: // 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 @@ -69,7 +65,7 @@ protected: wxHtmlEntitiesParser *entParser); friend class wxHtmlParser; public: - virtual ~wxHtmlTag(); + ~wxHtmlTag(); wxHtmlTag *GetParent() const {return m_Parent;} wxHtmlTag *GetFirstSibling() const; diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp index a468b0b00c..a0f9b6af37 100644 --- a/src/html/htmltag.cpp +++ b/src/html/htmltag.cpp @@ -54,8 +54,6 @@ class wxHtmlTagsCacheData : public wxVector { }; -IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject) - 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 //----------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxHtmlTag,wxObject) - wxHtmlTag::wxHtmlTag(wxHtmlTag *parent, const wxString& source, int pos, int end_pos, wxHtmlTagsCache *cache, - wxHtmlEntitiesParser *entParser) : wxObject() + wxHtmlEntitiesParser *entParser) { /* Setup DOM relations */ -- 2.50.0