X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ee9771b36607412f780f668961d59bb229c84e6..f2d8a2767ec3bc3d6c102d8958ee6b50dc1fa36c:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 53699fc856..3d243b762f 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -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; }