X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..bb69632a56a827bed4cfae842bfffa88259ac1aa:/src/html/m_fonts.cpp diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index 61e59f86c3..9e69afb79f 100644 --- a/src/html/m_fonts.cpp +++ b/src/html/m_fonts.cpp @@ -1,26 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_fonts.cpp +// Name: src/html/m_fonts.cpp // Purpose: wxHtml module for fonts & colors of fonts // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS - -#ifdef __BORDLANDC__ -#pragma hdrstop +#ifdef __BORLANDC__ + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP #endif #include "wx/html/forcelnk.h" @@ -31,10 +26,12 @@ FORCE_LINK_ME(m_fonts) -TAG_HANDLER_BEGIN(FONT, "FONT") +TAG_HANDLER_BEGIN(FONT, "FONT" ) TAG_HANDLER_VARS - wxSortedArrayString m_Faces; + wxArrayString m_Faces; + + TAG_HANDLER_CONSTR(FONT) { } TAG_HANDLER_PROC(tag) { @@ -70,17 +67,14 @@ TAG_HANDLER_BEGIN(FONT, "FONT") if (tag.HasParam(wxT("FACE"))) { if (m_Faces.GetCount() == 0) - { - wxFontEnumerator enu; - enu.EnumerateFacenames(); - m_Faces = *enu.GetFacenames(); - } + m_Faces = wxFontEnumerator::GetFacenames(); + wxStringTokenizer tk(tag.GetParam(wxT("FACE")), wxT(",")); int index; while (tk.HasMoreTokens()) { - if ((index = m_Faces.Index(tk.GetNextToken())) != wxNOT_FOUND) + if ((index = m_Faces.Index(tk.GetNextToken(), false)) != wxNOT_FOUND) { m_WParser->SetFontFace(m_Faces[index]); m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); @@ -106,7 +100,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT") m_WParser->SetActualColor(oldclr); m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr)); } - return TRUE; + return true; } TAG_HANDLER_END(FONT) @@ -114,11 +108,13 @@ TAG_HANDLER_END(FONT) TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE") + TAG_HANDLER_CONSTR(FACES_U) { } + TAG_HANDLER_PROC(tag) { int underlined = m_WParser->GetFontUnderlined(); - m_WParser->SetFontUnderlined(TRUE); + m_WParser->SetFontUnderlined(true); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); @@ -127,7 +123,7 @@ TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE") m_WParser->SetFontUnderlined(underlined); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - return TRUE; + return true; } TAG_HANDLER_END(FACES_U) @@ -136,12 +132,13 @@ TAG_HANDLER_END(FACES_U) TAG_HANDLER_BEGIN(FACES_B, "B,STRONG") + TAG_HANDLER_CONSTR(FACES_B) { } TAG_HANDLER_PROC(tag) { int bold = m_WParser->GetFontBold(); - m_WParser->SetFontBold(TRUE); + m_WParser->SetFontBold(true); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); @@ -150,7 +147,7 @@ TAG_HANDLER_BEGIN(FACES_B, "B,STRONG") m_WParser->SetFontBold(bold); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - return TRUE; + return true; } TAG_HANDLER_END(FACES_B) @@ -159,12 +156,13 @@ TAG_HANDLER_END(FACES_B) TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS") + TAG_HANDLER_CONSTR(FACES_I) { } TAG_HANDLER_PROC(tag) { int italic = m_WParser->GetFontItalic(); - m_WParser->SetFontItalic(TRUE); + m_WParser->SetFontItalic(true); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); @@ -173,7 +171,7 @@ TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS") m_WParser->SetFontItalic(italic); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - return TRUE; + return true; } TAG_HANDLER_END(FACES_I) @@ -182,12 +180,13 @@ TAG_HANDLER_END(FACES_I) TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP") + TAG_HANDLER_CONSTR(FACES_TT) { } TAG_HANDLER_PROC(tag) { int fixed = m_WParser->GetFontFixed(); - m_WParser->SetFontFixed(TRUE); + m_WParser->SetFontFixed(true); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); @@ -196,7 +195,7 @@ TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP") m_WParser->SetFontFixed(fixed); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - return TRUE; + return true; } TAG_HANDLER_END(FACES_TT) @@ -206,6 +205,7 @@ TAG_HANDLER_END(FACES_TT) TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") + TAG_HANDLER_CONSTR(Hx) { } TAG_HANDLER_PROC(tag) { @@ -219,10 +219,10 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") old_f = m_WParser->GetFontFixed(); old_al = m_WParser->GetAlign(); - m_WParser->SetFontBold(TRUE); - m_WParser->SetFontItalic(FALSE); - m_WParser->SetFontUnderlined(FALSE); - m_WParser->SetFontFixed(FALSE); + m_WParser->SetFontBold(true); + m_WParser->SetFontItalic(false); + m_WParser->SetFontUnderlined(false); + m_WParser->SetFontFixed(false); if (tag.GetName() == wxT("H1")) m_WParser->SetFontSize(7); @@ -233,20 +233,20 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") else if (tag.GetName() == wxT("H4")) { m_WParser->SetFontSize(5); - m_WParser->SetFontItalic(TRUE); - m_WParser->SetFontBold(FALSE); + m_WParser->SetFontItalic(true); + m_WParser->SetFontBold(false); } else if (tag.GetName() == wxT("H5")) m_WParser->SetFontSize(4); else if (tag.GetName() == wxT("H6")) { m_WParser->SetFontSize(4); - m_WParser->SetFontItalic(TRUE); - m_WParser->SetFontBold(FALSE); + m_WParser->SetFontItalic(true); + m_WParser->SetFontBold(false); } c = m_WParser->GetContainer(); - if (c->GetFirstCell()) + if (c->GetFirstChild()) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); @@ -275,13 +275,14 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") c = m_WParser->GetContainer(); c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); - return TRUE; + return true; } TAG_HANDLER_END(Hx) TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL") + TAG_HANDLER_CONSTR(BIGSMALL) { } TAG_HANDLER_PROC(tag) { @@ -297,7 +298,7 @@ TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL") m_WParser->SetFontSize(oldsize); m_WParser->GetContainer()->InsertCell( new wxHtmlFontCell(m_WParser->CreateCurrentFont())); - return TRUE; + return true; } TAG_HANDLER_END(BIGSMALL)