X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61d457caae3e33efe8e0953f79c4a94e366b22d7..f6e9a8189cfd9189418d6c0976a8a07f3bcd914b:/include/wx/html/m_templ.h diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h index fb272c61dc..df65329041 100644 --- a/include/wx/html/m_templ.h +++ b/include/wx/html/m_templ.h @@ -29,10 +29,9 @@ I STRONGLY recommend reading and understanding these macros!! #include "wx/html/winpars.h" #define TAG_HANDLER_BEGIN(name,tags) \ - class HTML_Handler_##name : public wxHtmlWinTagHandler \ + class wxHTML_Handler_##name : public wxHtmlWinTagHandler \ { \ public: \ - HTML_Handler_##name() : wxHtmlWinTagHandler() {} \ wxString GetSupportedTags() {return wxT(tags);} @@ -42,7 +41,7 @@ I STRONGLY recommend reading and understanding these macros!! #define TAG_HANDLER_CONSTR(name) \ public: \ - HTML_Handler_##name () : wxHtmlWinTagHandler() + wxHTML_Handler_##name () : wxHtmlWinTagHandler() #define TAG_HANDLER_PROC(varib) \ @@ -52,16 +51,15 @@ I STRONGLY recommend reading and understanding these macros!! #define TAG_HANDLER_END(name) \ - DECLARE_NO_COPY_CLASS(HTML_Handler_##name) \ }; #define TAGS_MODULE_BEGIN(name) \ - class HTML_Module##name : public wxHtmlTagsModule \ + class wxHTML_Module##name : public wxHtmlTagsModule \ { \ - DECLARE_DYNAMIC_CLASS(HTML_Module##name ) \ + DECLARE_DYNAMIC_CLASS(wxHTML_Module##name ) \ public: \ void FillHandlersTable(wxHtmlWinParser *parser) \ { @@ -70,7 +68,7 @@ I STRONGLY recommend reading and understanding these macros!! #define TAGS_MODULE_ADD(handler) \ - parser->AddTagHandler(new HTML_Handler_##handler); + parser->AddTagHandler(new wxHTML_Handler_##handler); @@ -78,7 +76,7 @@ I STRONGLY recommend reading and understanding these macros!! #define TAGS_MODULE_END(name) \ } \ }; \ - IMPLEMENT_DYNAMIC_CLASS(HTML_Module##name , wxHtmlTagsModule) + IMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule)