another approach to Unicodification of wxHTML handlers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-09 00:07:36 +00:00
parent 85f726f26a
commit 2dfc97eea1
11 changed files with 23 additions and 23 deletions

View File

@@ -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);}

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -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)
{

View File

@@ -48,7 +48,7 @@ class wxHtmlAnchorCell : public wxHtmlCell
TAG_HANDLER_BEGIN(A, wxT("A"))
TAG_HANDLER_BEGIN(A, "A")
TAG_HANDLER_PROC(tag)
{

View File

@@ -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;

View File

@@ -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)
{

View File

@@ -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))
{

View File

@@ -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;