Allow resetting background colour of wxHtmlContainerCell.
Don't use m_UseBkColour flag which remained always set once SetBackgroundColour() had been called, but just rely on m_BkColour itself being valid to determine whether we should use it. This allows to reset the background colour after setting it. Closes #15287. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -716,7 +716,7 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
|
||||
m_AlignVer = wxHTML_ALIGN_BOTTOM;
|
||||
m_IndentLeft = m_IndentRight = m_IndentTop = m_IndentBottom = 0;
|
||||
m_WidthFloat = 100; m_WidthFloatUnits = wxHTML_UNITS_PERCENT;
|
||||
m_UseBkColour = false;
|
||||
m_BkColour = wxNullColour;
|
||||
m_Border = 0;
|
||||
m_MinHeight = 0;
|
||||
m_MinHeightAlign = wxHTML_ALIGN_TOP;
|
||||
@@ -1096,7 +1096,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
int xlocal = x + m_PosX;
|
||||
int ylocal = y + m_PosY;
|
||||
|
||||
if (m_UseBkColour)
|
||||
if (m_BkColour.IsOk())
|
||||
{
|
||||
wxBrush myb = wxBrush(m_BkColour, wxBRUSHSTYLE_SOLID);
|
||||
|
||||
@@ -1217,10 +1217,7 @@ void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y,
|
||||
|
||||
wxColour wxHtmlContainerCell::GetBackgroundColour()
|
||||
{
|
||||
if (m_UseBkColour)
|
||||
return m_BkColour;
|
||||
else
|
||||
return wxNullColour;
|
||||
return m_BkColour;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user