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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-08-22 08:46:01 +00:00
parent 4f7e8fda39
commit 7da48d4928
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/html/htmltag.h
View File

@@ -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: private:
wxHtmlTagsCacheData *m_Cache; wxHtmlTagsCacheData *m_Cache;
size_t m_CachePos; 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: protected:
// constructs wxHtmlTag object based on HTML tag. // constructs wxHtmlTag object based on HTML tag.
// The tag begins (with '<' character) at position pos in source // The tag begins (with '<' character) at position pos in source
@@ -69,7 +65,7 @@ protected:
wxHtmlEntitiesParser *entParser); wxHtmlEntitiesParser *entParser);
friend class wxHtmlParser; friend class wxHtmlParser;
public: public:
virtual ~wxHtmlTag(); ~wxHtmlTag();
wxHtmlTag *GetParent() const {return m_Parent;} wxHtmlTag *GetParent() const {return m_Parent;}
wxHtmlTag *GetFirstSibling() const; wxHtmlTag *GetFirstSibling() const;

6
src/html/htmltag.cpp
View File

@@ -54,8 +54,6 @@ class wxHtmlTagsCacheData : public wxVector<wxHtmlCacheItem>
{ {
}; };
IMPLEMENT_CLASS(wxHtmlTagsCache,wxObject)
bool wxIsCDATAElement(const wxChar *tag) bool wxIsCDATAElement(const wxChar *tag)
{ {
return (wxStrcmp(tag, _T("SCRIPT")) == 0) || 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, wxHtmlTag::wxHtmlTag(wxHtmlTag *parent,
const wxString& source, int pos, int end_pos, const wxString& source, int pos, int end_pos,
wxHtmlTagsCache *cache, wxHtmlTagsCache *cache,
wxHtmlEntitiesParser *entParser) : wxObject() wxHtmlEntitiesParser *entParser)
{ {
/* Setup DOM relations */ /* Setup DOM relations */