X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9297b0eead20a0bfee71df18e0d8f0cbc402fb..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/html/m_templ.h

diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h
index 4df782c6a2..17ff701967 100644
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        m_templ.h
+// Name:        wx/html/m_templ.h
 // Purpose:     Modules template file
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -23,35 +23,16 @@ I STRONGLY recommend reading and understanding these macros!!
 #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"
 
-
 #define TAG_HANDLER_BEGIN(name,tags)                                      \
-    class HTML_Handler_##name : public wxHtmlWinTagHandler                \
+    class wxHTML_Handler_##name : public wxHtmlWinTagHandler              \
     {                                                                     \
         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:                                                           \
-        HTML_Handler_##name () : wxHtmlWinTagHandler()
+        wxHTML_Handler_##name () : wxHtmlWinTagHandler()
 
 
 #define TAG_HANDLER_PROC(varib)                                           \
@@ -76,9 +57,9 @@ I STRONGLY recommend reading and understanding these macros!!
 
 
 #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)               \
                 {
@@ -87,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);
 
 
 
@@ -95,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)