X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7235613f44c446e484052fcf262fbe509d1b6ff..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 7672465f96..cfe6a711fe 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -71,7 +71,8 @@ public: wxHtmlPageBreakCell() {} bool AdjustPagebreak(int* pagebreak, - const wxArrayInt& known_pagebreaks) const; + const wxArrayInt& known_pagebreaks, + int pageHeight) const; void Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), @@ -82,7 +83,10 @@ private: wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell); }; -bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, const wxArrayInt& known_pagebreaks) const +bool +wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, + const wxArrayInt& known_pagebreaks, + int WXUNUSED(pageHeight)) const { // When we are counting pages, 'known_pagebreaks' is non-NULL. // That's the only time we change 'pagebreak'. Otherwise, pages @@ -351,7 +355,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY") if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr)) { m_WParser->GetContainer()->InsertCell( - new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND)); + new wxHtmlColourCell(clr, wxHTML_CLR_TRANSPARENT_BACKGROUND)); winIface->SetHTMLBackgroundColour(clr); }