projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxABI_VERSION wrappers
[wxWidgets.git]
/
include
/
wx
/
html
/
m_templ.h
diff --git
a/include/wx/html/m_templ.h
b/include/wx/html/m_templ.h
index 4df782c6a2e49424f6b14a904dd0cfc9846667c9..df6532904173017f1151b3a175693cbe3c660a50 100644
(file)
--- a/
include/wx/html/m_templ.h
+++ b/
include/wx/html/m_templ.h
@@
-23,35
+23,16
@@
I STRONGLY recommend reading and understanding these macros!!
#define _WX_M_TEMPL_H_
#include "wx/defs.h"
#define _WX_M_TEMPL_H_
#include "wx/defs.h"
-#if wxUSE_HTML
-
-
-#ifdef __GNUG__
-#pragma interface
-#pragma implementation
-#endif
-
-#include <wx/wxprec.h>
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
-
-
+#if wxUSE_HTML
#include "wx/html/winpars.h"
#include "wx/html/winpars.h"
-
#define TAG_HANDLER_BEGIN(name,tags) \
#define TAG_HANDLER_BEGIN(name,tags) \
- class
HTML_Handler_##name : public wxHtmlWinTagHandler
\
+ class
wxHTML_Handler_##name : public wxHtmlWinTagHandler
\
{ \
public: \
{ \
public: \
- wxString GetSupportedTags() {return
tags
;}
+ wxString GetSupportedTags() {return
wxT(tags)
;}
@@
-60,7
+41,7
@@
I STRONGLY recommend reading and understanding these macros!!
#define TAG_HANDLER_CONSTR(name) \
public: \
#define TAG_HANDLER_CONSTR(name) \
public: \
- HTML_Handler_##name () : wxHtmlWinTagHandler()
+
wx
HTML_Handler_##name () : wxHtmlWinTagHandler()
#define TAG_HANDLER_PROC(varib) \
#define TAG_HANDLER_PROC(varib) \
@@
-76,9
+57,9
@@
I STRONGLY recommend reading and understanding these macros!!
#define TAGS_MODULE_BEGIN(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) \
{
public: \
void FillHandlersTable(wxHtmlWinParser *parser) \
{
@@
-87,7
+68,7
@@
I STRONGLY recommend reading and understanding these macros!!
#define TAGS_MODULE_ADD(handler) \
#define TAGS_MODULE_ADD(handler) \
- parser->AddTagHandler(new HTML_Handler_##handler);
+ parser->AddTagHandler(new
wx
HTML_Handler_##handler);
@@
-95,7
+76,7
@@
I STRONGLY recommend reading and understanding these macros!!
#define TAGS_MODULE_END(name) \
} \
}; \
#define TAGS_MODULE_END(name) \
} \
}; \
- IMPLEMENT_DYNAMIC_CLASS(HTML_Module##name , wxHtmlTagsModule)
+ IMPLEMENT_DYNAMIC_CLASS(
wx
HTML_Module##name , wxHtmlTagsModule)