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 */