Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem in mimetype database and put a temp. fix for font tags

Browse Source 
like <FONT SIZE=gaga>, i.e. without an proper integer argument


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-08-29 20:08:53 +00:00
parent f0d922cf78
commit c15d098cdf
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/mimetype.cpp
View File

@@ -1105,7 +1105,7 @@ void wxMimeTypesManagerImpl::AddMimeTypeInfo(const wxString& strMimeType,
if ( !strDesc.IsEmpty() ) { if ( !strDesc.IsEmpty() ) {
m_aDescriptions[index] = strDesc; // replace old value m_aDescriptions[index] = strDesc; // replace old value
} }
m_aExtensions[index] += strExtensions; m_aExtensions[index] += ' ' + strExtensions;
} }
} }

7
src/html/mod_fonts.cpp
View File

@@ -33,11 +33,11 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
TAG_HANDLER_PROC(tag) TAG_HANDLER_PROC(tag)
{ {
unsigned long tmp;
wxColour oldclr = m_WParser -> GetActualColor(); wxColour oldclr = m_WParser -> GetActualColor();
int oldsize = m_WParser -> GetFontSize(); int oldsize = m_WParser -> GetFontSize();
if (tag.HasParam("COLOR")) { if (tag.HasParam("COLOR")) {
unsigned long tmp = 0;
wxColour clr; wxColour clr;
tag.ScanParam("COLOR", "#%lX", &tmp); tag.ScanParam("COLOR", "#%lX", &tmp);
clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF)); clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
@@ -46,8 +46,11 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
} }
if (tag.HasParam("SIZE")) { 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); 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())); m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
} }