X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da80ae712a30132bf19127db544959db7e1a7b52..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index df13c18974..cacbefbc60 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -21,6 +21,9 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/dc.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/module.h" #endif #include "wx/print.h" @@ -28,8 +31,6 @@ #include "wx/html/htmprint.h" #include "wx/wxhtml.h" #include "wx/wfstream.h" -#include "wx/module.h" -#include "wx/settings.h" //-------------------------------------------------------------------------------- @@ -103,20 +104,19 @@ void wxHtmlDCRenderer::SetStandardFonts(int size, m_Cells->Layout(m_Width); } - -int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, - int maxHeight, - int *known_pagebreaks, int number_of_pages) +int wxHtmlDCRenderer::Render(int x, int y, + wxArrayInt& known_pagebreaks, + int from, int dont_render, int to) { int pbreak, hght; if (m_Cells == NULL || m_DC == NULL) return 0; pbreak = (int)(from + m_Height); - while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {} + while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks)) {} hght = pbreak - from; - if (maxHeight < hght) - hght = maxHeight; + if(to < hght) + hght = to; if (!dont_render) { @@ -137,7 +137,6 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, } - int wxHtmlDCRenderer::GetTotalHeight() { if (m_Cells) return m_Cells->GetHeight(); @@ -252,7 +251,7 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) bool wxHtmlPrintout::OnPrintPage(int page) { wxDC *dc = GetDC(); - if (dc) + if (dc && dc->IsOk()) { if (HasPage(page)) RenderPage(dc, page); @@ -265,16 +264,19 @@ bool wxHtmlPrintout::OnPrintPage(int page) void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) { *minPage = 1; - *maxPage = m_NumPages; + if ( m_NumPages >= (signed)m_PageBreaks.GetCount()-1) + *maxPage = m_NumPages; + else + *maxPage = (signed)m_PageBreaks.GetCount()-1; *selPageFrom = 1; - *selPageTo = m_NumPages; + *selPageTo = (signed)m_PageBreaks.GetCount()-1; } bool wxHtmlPrintout::HasPage(int pageNum) { - return (pageNum >= 1 && pageNum <= m_NumPages); + return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount(); } @@ -360,16 +362,24 @@ void wxHtmlPrintout::CountPages() ppmm_v = (float)pageHeight / mm_h; int pos = 0; - m_NumPages = 0; + // m_PageBreaks[0] = 0; - m_PageBreaks[0] = 0; + m_PageBreaks.Clear(); + m_PageBreaks.Add( 0); do { pos = m_Renderer->Render((int)( ppmm_h * m_MarginLeft), - (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), - pos, true, INT_MAX, m_PageBreaks, m_NumPages); - m_PageBreaks[++m_NumPages] = pos; + (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), + m_PageBreaks, + pos, true, INT_MAX); + m_PageBreaks.Add( pos); + if( m_PageBreaks.GetCount() > wxHTML_PRINT_MAX_PAGES) + { + wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!"), + _("Warning"), wxCANCEL | wxICON_ERROR ); + break; + } } while (pos < m_Renderer->GetTotalHeight()); } @@ -403,19 +413,20 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) dc->SetBackgroundMode(wxTRANSPARENT); m_Renderer->Render((int) (ppmm_h * m_MarginLeft), - (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), + (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks, m_PageBreaks[page-1], false, m_PageBreaks[page]-m_PageBreaks[page-1]); + m_RendererHdr->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY); if (m_Headers[page % 2] != wxEmptyString) { m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page)); - m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop)); + m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop), m_PageBreaks); } if (m_Footers[page % 2] != wxEmptyString) { m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[page % 2], page)); - m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight)); + m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight), m_PageBreaks); } } @@ -429,9 +440,15 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page) num.Printf(wxT("%i"), page); r.Replace(wxT("@PAGENUM@"), num); - num.Printf(wxT("%i"), m_NumPages); + num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.GetCount() - 1)); r.Replace(wxT("@PAGESCNT@"), num); + const wxDateTime now = wxDateTime::Now(); + r.Replace(wxT("@DATE@"), now.FormatDate()); + r.Replace(wxT("@TIME@"), now.FormatTime()); + + r.Replace(wxT("@TITLE@"), GetTitle()); + return r; }