From c15d098cdffb0eae6a5d1b92a1a9655ed428f486 Mon Sep 17 00:00:00 2001 From: Harco de Hilster Date: Sun, 29 Aug 1999 20:08:53 +0000 Subject: [PATCH] fixed problem in mimetype database and put a temp. fix for font tags like , i.e. without an proper integer argument git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/mimetype.cpp | 2 +- src/html/mod_fonts.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/mimetype.cpp b/src/common/mimetype.cpp index 2785c1f9ce..7340228145 100644 --- a/src/common/mimetype.cpp +++ b/src/common/mimetype.cpp @@ -1105,7 +1105,7 @@ void wxMimeTypesManagerImpl::AddMimeTypeInfo(const wxString& strMimeType, if ( !strDesc.IsEmpty() ) { m_aDescriptions[index] = strDesc; // replace old value } - m_aExtensions[index] += strExtensions; + m_aExtensions[index] += ' ' + strExtensions; } } diff --git a/src/html/mod_fonts.cpp b/src/html/mod_fonts.cpp index 7d27a6ea0d..fa34b85609 100644 --- a/src/html/mod_fonts.cpp +++ b/src/html/mod_fonts.cpp @@ -33,11 +33,11 @@ TAG_HANDLER_BEGIN(FONT, "FONT") TAG_HANDLER_PROC(tag) { - unsigned long tmp; wxColour oldclr = m_WParser -> GetActualColor(); int oldsize = m_WParser -> GetFontSize(); if (tag.HasParam("COLOR")) { + unsigned long tmp = 0; wxColour clr; tag.ScanParam("COLOR", "#%lX", &tmp); clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF)); @@ -46,8 +46,11 @@ TAG_HANDLER_BEGIN(FONT, "FONT") } if (tag.HasParam("SIZE")) { + // give 'tmp' an initial value. If conversion fails, it will keep this value. + long tmp = 0; tag.ScanParam("SIZE", "%li", &tmp); - m_WParser -> SetFontSize(tmp); + // We *really* should check the result of (v)sscanf, but ScanParam returns void... + m_WParser -> SetFontSize(oldsize+tmp); m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont())); }