X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9899a70bc0b011ad8aa8e7d57e6f01047423222a..e83c4d401206ff9d5568f03ade6d9713c57bdd51:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 4ce2e3b80a..b91f4b1d08 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -151,7 +151,7 @@ int wxHtmlDCRenderer::Render(int x, int y, int pbreak, hght; pbreak = (int)(from + m_Height); - while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks)) {} + while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, m_Height)) {} hght = pbreak - from; if(to < hght) hght = to; @@ -695,7 +695,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr // Pass two printout objects: for preview, and possible printing. wxPrintDialogData printDialogData(*GetPrintData()); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); - if (!preview->Ok()) + if (!preview->IsOk()) { delete preview; return false; @@ -731,7 +731,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) void wxHtmlEasyPrinting::PageSetup() { - if (!GetPrintData()->Ok()) + if (!GetPrintData()->IsOk()) { wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); return;