X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92337e39b91b3928cfa8e71803da2a1e9506eb75..e87fb0ee85cfb1f3cf5bd83e79e8e32e9b0f3b1a:/src/html/m_layout.cpp?ds=sidebyside diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index e501f1f6dc..abd44132e9 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -68,12 +68,18 @@ FORCE_LINK_ME(m_layout) class WXDLLEXPORT wxHtmlPageBreakCell : public wxHtmlCell { - public: +public: wxHtmlPageBreakCell() {} - bool AdjustPagebreak(int* pagebreak, int* known_pagebreaks = NULL, int number_of_pages = 0) const; + bool AdjustPagebreak(int* pagebreak, + int* known_pagebreaks = NULL, + int number_of_pages = 0) const; + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingState& WXUNUSED(state)) {} - private: +private: DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell) }; @@ -130,7 +136,7 @@ TAG_HANDLER_BEGIN(P, "P") TAG_HANDLER_PROC(tag) { - if (m_WParser->GetContainer()->GetFirstCell() != NULL) + if (m_WParser->GetContainer()->GetFirstChild() != NULL) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); @@ -171,7 +177,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER") wxHtmlContainerCell *c = m_WParser->GetContainer(); m_WParser->SetAlign(wxHTML_ALIGN_CENTER); - if (c->GetFirstCell() != NULL) + if (c->GetFirstChild() != NULL) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); @@ -184,7 +190,7 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER") ParseInner(tag); m_WParser->SetAlign(old); - if (c->GetFirstCell() != NULL) + if (c->GetFirstChild() != NULL) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); @@ -225,7 +231,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV") { int old = m_WParser->GetAlign(); wxHtmlContainerCell *c = m_WParser->GetContainer(); - if (c->GetFirstCell() != NULL) + if (c->GetFirstChild() != NULL) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); @@ -242,7 +248,7 @@ TAG_HANDLER_BEGIN(DIV, "DIV") ParseInner(tag); m_WParser->SetAlign(old); - if (c->GetFirstCell() != NULL) + if (c->GetFirstChild() != NULL) { m_WParser->CloseContainer(); m_WParser->OpenContainer();