Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
@@ -66,7 +66,7 @@ public:
|
||||
// wx28HtmlParser
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wx28HtmlParser,wxObject)
|
||||
wxIMPLEMENT_ABSTRACT_CLASS(wx28HtmlParser, wxObject);
|
||||
|
||||
wx28HtmlParser::wx28HtmlParser()
|
||||
: wxObject(), m_HandlersHash(wxKEY_STRING),
|
||||
@@ -439,7 +439,7 @@ wxString wx28HtmlParser::GetInnerSource(const wx28HtmlTag& tag)
|
||||
// wx28HtmlTagHandler
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wx28HtmlTagHandler,wxObject)
|
||||
wxIMPLEMENT_ABSTRACT_CLASS(wx28HtmlTagHandler, wxObject);
|
||||
|
||||
void wx28HtmlTagHandler::ParseInnerSource(const wxString& source)
|
||||
{
|
||||
@@ -455,7 +455,7 @@ void wx28HtmlTagHandler::ParseInnerSource(const wxString& source)
|
||||
// wx28HtmlEntitiesParser
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject)
|
||||
wxIMPLEMENT_DYNAMIC_CLASS(wx28HtmlEntitiesParser,wxObject);
|
||||
|
||||
wx28HtmlEntitiesParser::wx28HtmlEntitiesParser()
|
||||
#if !wxUSE_UNICODE
|
||||
@@ -895,7 +895,7 @@ public:
|
||||
protected:
|
||||
virtual void AddText(const wxChar* WXUNUSED(txt)) {}
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxMetaTagParser)
|
||||
wxDECLARE_NO_COPY_CLASS(wxMetaTagParser);
|
||||
};
|
||||
|
||||
class wxMetaTagHandler : public wx28HtmlTagHandler
|
||||
@@ -908,7 +908,7 @@ public:
|
||||
private:
|
||||
wxString *m_retval;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxMetaTagHandler)
|
||||
wxDECLARE_NO_COPY_CLASS(wxMetaTagHandler);
|
||||
};
|
||||
|
||||
bool wxMetaTagHandler::HandleTag(const wx28HtmlTag& tag)
|
||||
|
@@ -38,7 +38,7 @@ enum wx28HtmlURLType
|
||||
// 2 tags.
|
||||
class wx28HtmlParser : public wxObject
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS(wx28HtmlParser)
|
||||
wxDECLARE_ABSTRACT_CLASS(wx28HtmlParser);
|
||||
|
||||
public:
|
||||
wx28HtmlParser();
|
||||
@@ -171,7 +171,7 @@ protected:
|
||||
wxList m_HandlersList;
|
||||
wxHashTable m_HandlersHash;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wx28HtmlParser)
|
||||
wxDECLARE_NO_COPY_CLASS(wx28HtmlParser);
|
||||
|
||||
// class for opening files (file system)
|
||||
wxFileSystem *m_FS;
|
||||
@@ -196,7 +196,7 @@ protected:
|
||||
// 3. Handler restores original state of the parser
|
||||
class wx28HtmlTagHandler : public wxObject
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS(wx28HtmlTagHandler)
|
||||
wxDECLARE_ABSTRACT_CLASS(wx28HtmlTagHandler);
|
||||
|
||||
public:
|
||||
wx28HtmlTagHandler() : wxObject () { m_Parser = NULL; }
|
||||
@@ -234,7 +234,7 @@ protected:
|
||||
|
||||
wx28HtmlParser *m_Parser;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wx28HtmlTagHandler)
|
||||
wxDECLARE_NO_COPY_CLASS(wx28HtmlTagHandler);
|
||||
};
|
||||
|
||||
|
||||
@@ -242,7 +242,7 @@ protected:
|
||||
// both named entities and &#xxxx entries where xxxx is Unicode code.
|
||||
class wx28HtmlEntitiesParser : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wx28HtmlEntitiesParser)
|
||||
wxDECLARE_DYNAMIC_CLASS(wx28HtmlEntitiesParser);
|
||||
|
||||
public:
|
||||
wx28HtmlEntitiesParser();
|
||||
@@ -272,7 +272,7 @@ protected:
|
||||
wxFontEncoding m_encoding;
|
||||
#endif
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wx28HtmlEntitiesParser)
|
||||
wxDECLARE_NO_COPY_CLASS(wx28HtmlEntitiesParser);
|
||||
};
|
||||
|
||||
|
||||
|
@@ -41,7 +41,7 @@ struct wx28HtmlCacheItem
|
||||
};
|
||||
|
||||
|
||||
IMPLEMENT_CLASS(wx28HtmlTagsCache,wxObject)
|
||||
wxIMPLEMENT_CLASS(wx28HtmlTagsCache,wxObject);
|
||||
|
||||
#define CACHE_INCREMENT 64
|
||||
|
||||
@@ -207,7 +207,7 @@ void wx28HtmlTagsCache::QueryTag(int at, int* end1, int* end2)
|
||||
// wx28HtmlTag
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS(wx28HtmlTag,wxObject)
|
||||
wxIMPLEMENT_CLASS(wx28HtmlTag,wxObject);
|
||||
|
||||
wx28HtmlTag::wx28HtmlTag(wx28HtmlTag *parent,
|
||||
const wxString& source, int pos, int end_pos,
|
||||
|
@@ -25,7 +25,7 @@ struct wx28HtmlCacheItem;
|
||||
|
||||
class wx28HtmlTagsCache : public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wx28HtmlTagsCache)
|
||||
wxDECLARE_DYNAMIC_CLASS(wx28HtmlTagsCache);
|
||||
|
||||
private:
|
||||
wx28HtmlCacheItem *m_Cache;
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
// Finds parameters for tag starting at at and fills the variables
|
||||
void QueryTag(int at, int* end1, int* end2);
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wx28HtmlTagsCache)
|
||||
wxDECLARE_NO_COPY_CLASS(wx28HtmlTagsCache);
|
||||
};
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
|
||||
class wx28HtmlTag : public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wx28HtmlTag)
|
||||
wxDECLARE_CLASS(wx28HtmlTag);
|
||||
|
||||
protected:
|
||||
// constructs wx28HtmlTag object based on HTML tag.
|
||||
@@ -129,7 +129,7 @@ private:
|
||||
wx28HtmlTag *m_FirstChild, *m_LastChild;
|
||||
wx28HtmlTag *m_Parent;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wx28HtmlTag)
|
||||
wxDECLARE_NO_COPY_CLASS(wx28HtmlTag);
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user