fix typo in drawing slider ticks; added assert to check for it (slightly modified...

[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 a54725ee5f45fe7ae89512e239b502fc004c508e..7dc0e162276408f895d967a95201f6db893ac8c7 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)                                      \
     class HTML_Handler_##name : public wxHtmlWinTagHandler                \
     {                                                                     \
         public:                                                           \
 #define TAG_HANDLER_BEGIN(name,tags)                                      \
     class HTML_Handler_##name : public wxHtmlWinTagHandler                \
     {                                                                     \
         public:                                                           \

-            wxString GetSupportedTags() {return tags;}
+            wxString GetSupportedTags() {return wxT(tags);}

 
 
 
 
 
 


@@ -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 HTML_Handler_##handler);