From 4bfa6c94c8c2eec77d6bdf7251c0a2dd515e5019 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jan 2013 02:09:09 +0000 Subject: [PATCH] Really fix the background colour used for the cells in wxHTML tables. Respect "bgcolor" attributes of tags, they were ignored since the changes of r72589 (see #14443). Closes #14909. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/m_tables.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/html/m_tables.cpp b/src/html/m_tables.cpp index 49c61dfe5b..07f7b61658 100644 --- a/src/html/m_tables.cpp +++ b/src/html/m_tables.cpp @@ -821,7 +821,11 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH") new wxHtmlFontCell(m_WParser->CreateCurrentFont())); } - CallParseInnerWithBg(tag, m_Table->GetRowDefaultBackgroundColour()); + wxColour bgCol; + if ( !tag.GetParamAsColour(wxT("BGCOLOR"), &bgCol) ) + bgCol = m_Table->GetRowDefaultBackgroundColour(); + + CallParseInnerWithBg(tag, bgCol); if ( isHeader ) { -- 2.45.2