X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6540132fa1ee1b36c155ea39c84899e6beb2664e..71a09c3579dd5cb4cd8fa7fdc143561cbff74e12:/src/html/m_fonts.cpp diff --git a/src/html/m_fonts.cpp b/src/html/m_fonts.cpp index cd33cd2119..ab4fce6f95 100644 --- a/src/html/m_fonts.cpp +++ b/src/html/m_fonts.cpp @@ -2,7 +2,6 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,7 @@ #if wxUSE_HTML && wxUSE_STREAMS -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #endif #include "wx/html/forcelnk.h" @@ -51,10 +50,11 @@ TAG_HANDLER_BEGIN(FONT, "FONT" ) if (tag.HasParam(wxT("SIZE"))) { - int tmp = 0; - wxChar c = tag.GetParam(wxT("SIZE")).GetChar(0); - if (tag.GetParamAsInt(wxT("SIZE"), &tmp)) + long tmp = 0; + const wxString sizeStr = tag.GetParam(wxT("SIZE")); + if (sizeStr.ToLong(&tmp)) { + wxChar c = sizeStr[0]; if (c == wxT('+') || c == wxT('-')) m_WParser->SetFontSize(oldsize+tmp); else @@ -106,7 +106,7 @@ TAG_HANDLER_BEGIN(FONT, "FONT" ) TAG_HANDLER_END(FONT) -TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE") +TAG_HANDLER_BEGIN(FACES_U, "U,STRIKE,DEL") TAG_HANDLER_CONSTR(FACES_U) { }