Don't define __STRICT_ANSI__, we should build both with and without it.

[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 63d29000bb1a5a0ce7ad7c76b160de20f32c01c4..58603ac0863b89c997ef580f276451ccd0950b43 100644 (file)
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        m_templ.h
+// Name:        wx/html/m_templ.h
 // Purpose:     Modules template file
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,35 +22,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 "m_templ.h"
-#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 +40,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 +56,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 +67,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 +75,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)