diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h
index 9d9174772d..7dc0e16227 100644
--- a/include/wx/html/m_templ.h
+++ b/include/wx/html/m_templ.h
@@ -32,7 +32,7 @@ I STRONGLY recommend reading and understanding these macros!!
class HTML_Handler_##name : public wxHtmlWinTagHandler \
{ \
public: \
- wxString GetSupportedTags() {return tags;}
+ wxString GetSupportedTags() {return wxT(tags);}
diff --git a/src/html/m_dflist.cpp b/src/html/m_dflist.cpp
index b8568821c5..e113412e7a 100644
--- a/src/html/m_dflist.cpp
+++ b/src/html/m_dflist.cpp
@@ -34,7 +34,7 @@ FORCE_LINK_ME(m_dflist)
-TAG_HANDLER_BEGIN(DEFLIST, wxT("DL,DT,DD") )
+TAG_HANDLER_BEGIN(DEFLIST, "DL,DT,DD" )
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp
index 479ceb5ea2..8582927cf7 100644
--- a/src/html/m_fonts.cpp
+++ b/src/html/m_fonts.cpp
@@ -31,7 +31,7 @@
FORCE_LINK_ME(m_fonts)
-TAG_HANDLER_BEGIN(FONT, wxT("FONT") )
+TAG_HANDLER_BEGIN(FONT, "FONT" )
TAG_HANDLER_VARS
wxArrayString m_Faces;
@@ -112,7 +112,7 @@ TAG_HANDLER_BEGIN(FONT, wxT("FONT") )
TAG_HANDLER_END(FONT)
-TAG_HANDLER_BEGIN(FACES_U, wxT("U,STRIKE"))
+TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE")
TAG_HANDLER_PROC(tag)
{
@@ -135,7 +135,7 @@ TAG_HANDLER_END(FACES_U)
-TAG_HANDLER_BEGIN(FACES_B, wxT("B,STRONG"))
+TAG_HANDLER_BEGIN(FACES_B, "B,STRONG")
TAG_HANDLER_PROC(tag)
{
@@ -158,7 +158,7 @@ TAG_HANDLER_END(FACES_B)
-TAG_HANDLER_BEGIN(FACES_I, wxT("I,EM,CITE,ADDRESS"))
+TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS")
TAG_HANDLER_PROC(tag)
{
@@ -181,7 +181,7 @@ TAG_HANDLER_END(FACES_I)
-TAG_HANDLER_BEGIN(FACES_TT, wxT("TT,CODE,KBD,SAMP"))
+TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP")
TAG_HANDLER_PROC(tag)
{
@@ -205,7 +205,7 @@ TAG_HANDLER_END(FACES_TT)
-TAG_HANDLER_BEGIN(Hx, wxT("H1,H2,H3,H4,H5,H6"))
+TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6")
TAG_HANDLER_PROC(tag)
{
@@ -281,7 +281,7 @@ TAG_HANDLER_BEGIN(Hx, wxT("H1,H2,H3,H4,H5,H6"))
TAG_HANDLER_END(Hx)
-TAG_HANDLER_BEGIN(BIGSMALL, wxT("BIG,SMALL"))
+TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_hline.cpp b/src/html/m_hline.cpp
index adcc8093b9..d0a1b033bc 100644
--- a/src/html/m_hline.cpp
+++ b/src/html/m_hline.cpp
@@ -69,7 +69,7 @@ void wxHtmlLineCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXU
//-----------------------------------------------------------------------------
-TAG_HANDLER_BEGIN(HR, wxT("HR"))
+TAG_HANDLER_BEGIN(HR, "HR")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index c428b4fdbf..aaf6a8fa4a 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -611,7 +611,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
// tag handler
//--------------------------------------------------------------------------------
-TAG_HANDLER_BEGIN(IMG, wxT("IMG,MAP,AREA"))
+TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index bce598e298..aeb0478d49 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -31,7 +31,7 @@
FORCE_LINK_ME(m_layout)
-TAG_HANDLER_BEGIN(P, wxT("P"))
+TAG_HANDLER_BEGIN(P, "P")
TAG_HANDLER_PROC(tag)
{
@@ -49,7 +49,7 @@ TAG_HANDLER_END(P)
-TAG_HANDLER_BEGIN(BR, wxT("BR"))
+TAG_HANDLER_BEGIN(BR, "BR")
TAG_HANDLER_PROC(tag)
{
@@ -68,7 +68,7 @@ TAG_HANDLER_END(BR)
-TAG_HANDLER_BEGIN(CENTER, wxT("CENTER"))
+TAG_HANDLER_BEGIN(CENTER, "CENTER")
TAG_HANDLER_PROC(tag)
{
@@ -106,7 +106,7 @@ TAG_HANDLER_END(CENTER)
-TAG_HANDLER_BEGIN(DIV, wxT("DIV"))
+TAG_HANDLER_BEGIN(DIV, "DIV")
TAG_HANDLER_PROC(tag)
{
@@ -145,7 +145,7 @@ TAG_HANDLER_END(DIV)
-TAG_HANDLER_BEGIN(TITLE, wxT("TITLE"))
+TAG_HANDLER_BEGIN(TITLE, "TITLE")
TAG_HANDLER_PROC(tag)
{
@@ -167,7 +167,7 @@ TAG_HANDLER_END(TITLE)
-TAG_HANDLER_BEGIN(BODY, wxT("BODY"))
+TAG_HANDLER_BEGIN(BODY, "BODY")
TAG_HANDLER_PROC(tag)
{
@@ -196,7 +196,7 @@ TAG_HANDLER_END(BODY)
-TAG_HANDLER_BEGIN(BLOCKQUOTE, wxT("BLOCKQUOTE"))
+TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index b20c14402e..dd0c0eae07 100644
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -48,7 +48,7 @@ class wxHtmlAnchorCell : public wxHtmlCell
-TAG_HANDLER_BEGIN(A, wxT("A"))
+TAG_HANDLER_BEGIN(A, "A")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_list.cpp b/src/html/m_list.cpp
index f45c64d6b3..0549463eab 100644
--- a/src/html/m_list.cpp
+++ b/src/html/m_list.cpp
@@ -70,7 +70,7 @@ void wxHtmlListmarkCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int
//-----------------------------------------------------------------------------
-TAG_HANDLER_BEGIN(OLULLI, wxT("OL,UL,LI") )
+TAG_HANDLER_BEGIN(OLULLI, "OL,UL,LI")
TAG_HANDLER_VARS
int m_Numbering;
diff --git a/src/html/m_pre.cpp b/src/html/m_pre.cpp
index e5a2c44147..313d8a88bc 100644
--- a/src/html/m_pre.cpp
+++ b/src/html/m_pre.cpp
@@ -68,7 +68,7 @@ static wxString LINKAGEMODE HtmlizeWhitespaces(const wxString& str)
//-----------------------------------------------------------------------------
-TAG_HANDLER_BEGIN(PRE, wxT("PRE"))
+TAG_HANDLER_BEGIN(PRE, "PRE")
TAG_HANDLER_PROC(tag)
{
diff --git a/src/html/m_style.cpp b/src/html/m_style.cpp
index 9f191ff3b8..9913b83703 100644
--- a/src/html/m_style.cpp
+++ b/src/html/m_style.cpp
@@ -30,7 +30,7 @@
FORCE_LINK_ME(m_style)
-TAG_HANDLER_BEGIN(STYLE, wxT("STYLE"))
+TAG_HANDLER_BEGIN(STYLE, "STYLE")
TAG_HANDLER_PROC(WXUNUSED(tag))
{
diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp
index 7a09ed6b74..07aa795bac 100644
--- a/src/html/m_tables.cpp
+++ b/src/html/m_tables.cpp
@@ -519,7 +519,7 @@ void wxHtmlTableCell::Layout(int w)
//-----------------------------------------------------------------------------
-TAG_HANDLER_BEGIN(TABLE, wxT("TABLE,TR,TD,TH"))
+TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
TAG_HANDLER_VARS
wxHtmlTableCell* m_Table;