X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/html/m_fonts.cpp?ds=sidebyside diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index 67310dea59..0014a38ed8 100644 --- a/src/html/m_fonts.cpp +++ b/src/html/m_fonts.cpp @@ -21,7 +21,6 @@ #endif #ifndef WXPRECOMP -#include "wx/wx.h" #endif #include "wx/html/forcelnk.h" @@ -35,7 +34,7 @@ FORCE_LINK_ME(m_fonts) TAG_HANDLER_BEGIN(FONT, "FONT") TAG_HANDLER_VARS - wxSortedArrayString m_Faces; + wxArrayString m_Faces; TAG_HANDLER_PROC(tag) { @@ -44,69 +43,66 @@ TAG_HANDLER_BEGIN(FONT, "FONT") wxString oldface = m_WParser->GetFontFace(); if (tag.HasParam(wxT("COLOR"))) - { - unsigned long tmp = 0; + { wxColour clr; - if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) - { - clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16), - (unsigned char)((tmp & 0x00FF00) >> 8), - (unsigned char)(tmp & 0x0000FF)); + if (tag.GetParamAsColour(wxT("COLOR"), &clr)) + { m_WParser->SetActualColor(clr); m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(clr)); } } if (tag.HasParam(wxT("SIZE"))) - { - long tmp = 0; - wxChar c = tag.GetParam(wxT("SIZE"))[(unsigned int) 0]; - if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) - { - if (c == '+' || c == '-') + { + int tmp = 0; + wxChar c = tag.GetParam(wxT("SIZE")).GetChar(0); + if (tag.GetParamAsInt(wxT("SIZE"), &tmp)) + { + if (c == wxT('+') || c == wxT('-')) m_WParser->SetFontSize(oldsize+tmp); else m_WParser->SetFontSize(tmp); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); } } if (tag.HasParam(wxT("FACE"))) - { + { if (m_Faces.GetCount() == 0) - { + { wxFontEnumerator enu; enu.EnumerateFacenames(); m_Faces = *enu.GetFacenames(); } - wxStringTokenizer tk(tag.GetParam(wxT("FACE")), ","); + 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())); break; } - } + } } ParseInner(tag); if (oldface != m_WParser->GetFontFace()) - { + { m_WParser->SetFontFace(oldface); m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); } if (oldsize != m_WParser->GetFontSize()) - { + { m_WParser->SetFontSize(oldsize); m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); } if (oldclr != m_WParser->GetActualColor()) - { + { m_WParser->SetActualColor(oldclr); m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(oldclr)); } @@ -123,12 +119,14 @@ TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE") int underlined = m_WParser->GetFontUnderlined(); m_WParser->SetFontUnderlined(TRUE); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); ParseInner(tag); m_WParser->SetFontUnderlined(underlined); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); return TRUE; } @@ -144,12 +142,14 @@ TAG_HANDLER_BEGIN(FACES_B, "B,STRONG") int bold = m_WParser->GetFontBold(); m_WParser->SetFontBold(TRUE); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); ParseInner(tag); m_WParser->SetFontBold(bold); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); return TRUE; } @@ -165,12 +165,14 @@ TAG_HANDLER_BEGIN(FACES_I, "I,EM,CITE,ADDRESS") int italic = m_WParser->GetFontItalic(); m_WParser->SetFontItalic(TRUE); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); ParseInner(tag); m_WParser->SetFontItalic(italic); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); return TRUE; } @@ -186,12 +188,14 @@ TAG_HANDLER_BEGIN(FACES_TT, "TT,CODE,KBD,SAMP") int fixed = m_WParser->GetFontFixed(); m_WParser->SetFontFixed(TRUE); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); ParseInner(tag); m_WParser->SetFontFixed(fixed); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); return TRUE; } @@ -227,7 +231,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") else if (tag.GetName() == wxT("H3")) m_WParser->SetFontSize(5); else if (tag.GetName() == wxT("H4")) - { + { m_WParser->SetFontSize(5); m_WParser->SetFontItalic(TRUE); m_WParser->SetFontBold(FALSE); @@ -235,7 +239,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") 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); @@ -243,7 +247,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") c = m_WParser->GetContainer(); if (c->GetFirstCell()) - { + { m_WParser->CloseContainer(); m_WParser->OpenContainer(); c = m_WParser->GetContainer(); @@ -264,7 +268,8 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") m_WParser->SetFontFixed(old_f); m_WParser->SetAlign(old_al); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); m_WParser->CloseContainer(); m_WParser->OpenContainer(); c = m_WParser->GetContainer(); @@ -284,12 +289,14 @@ TAG_HANDLER_BEGIN(BIGSMALL, "BIG,SMALL") int sz = (tag.GetName() == wxT("BIG")) ? +1 : -1; m_WParser->SetFontSize(sz); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); ParseInner(tag); m_WParser->SetFontSize(oldsize); - m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont())); + m_WParser->GetContainer()->InsertCell( + new wxHtmlFontCell(m_WParser->CreateCurrentFont())); return TRUE; }