X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04dbb6467be8f564f380bd9a1106fbdecbd26a98..245f35816d761212279e8cf223475efb7a367553:/src/html/m_fonts.cpp?ds=sidebyside diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index 61e59f86c3..7ec96a0b50 100644 --- a/src/html/m_fonts.cpp +++ b/src/html/m_fonts.cpp @@ -16,7 +16,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -31,10 +31,10 @@ 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_PROC(tag) { @@ -80,7 +80,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT") 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())); @@ -246,7 +246,7 @@ TAG_HANDLER_BEGIN(Hx, "H1,H2,H3,H4,H5,H6") } c = m_WParser->GetContainer(); - if (c->GetFirstCell()) + if (c->GetFirstChild()) { m_WParser->CloseContainer(); m_WParser->OpenContainer();