X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4eecf1150d4954e389f49c402756f2381915dd10..d8c5974799b29e0a0382ffca9c9db9377581bbd4:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 62ff13af35..606cbefdd7 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -9,7 +9,7 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "htmprint.h" #endif @@ -36,6 +36,7 @@ #include "wx/html/htmprint.h" #include "wx/wxhtml.h" #include "wx/wfstream.h" +#include "wx/module.h" //-------------------------------------------------------------------------------- @@ -100,24 +101,29 @@ void wxHtmlDCRenderer::SetFonts(wxString normal_face, wxString fixed_face, } -int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render) +int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, int *known_pagebreaks, int number_of_pages) { int pbreak, hght; if (m_Cells == NULL || m_DC == NULL) return 0; pbreak = (int)(from + m_Height); - while (m_Cells->AdjustPagebreak(&pbreak)) {} + while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {} hght = pbreak - from; + if(to < hght) + hght = to; if (!dont_render) { + wxHtmlRenderingInfo rinfo; + wxDefaultHtmlRenderingStyle rstyle; + rinfo.SetStyle(&rstyle); m_DC->SetBrush(*wxWHITE_BRUSH); - m_DC->SetClippingRegion(x, y, m_Width, hght); m_Cells->Draw(*m_DC, - x, (y - from), - y, pbreak + (y /*- from*/)); + x, (y - from), + y, pbreak + (y /*- from*/), + rinfo); m_DC->DestroyClippingRegion(); } @@ -134,25 +140,12 @@ int wxHtmlDCRenderer::GetTotalHeight() } - - - - - - - - - - - - - - //-------------------------------------------------------------------------------- // wxHtmlPrintout //-------------------------------------------------------------------------------- +wxList wxHtmlPrintout::m_Filters; wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title) { @@ -174,15 +167,22 @@ wxHtmlPrintout::~wxHtmlPrintout() delete m_RendererHdr; } +void wxHtmlPrintout::CleanUpStatics() +{ + WX_CLEAR_LIST(wxList, m_Filters); +} +// Adds input filter +void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter) +{ + m_Filters.Append(filter); +} -bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) +void wxHtmlPrintout::OnPreparePrinting() { int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h; float ppmm_h, ppmm_v; - if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE; - GetPageSizePixels(&pageWidth, &pageHeight); GetPageSizeMM(&mm_w, &mm_h); ppmm_h = (float)pageWidth / mm_w; @@ -234,6 +234,12 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) )); m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir); CountPages(); +} + +bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) +{ + if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE; + return TRUE; } @@ -254,9 +260,9 @@ bool wxHtmlPrintout::OnPrintPage(int page) void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) { *minPage = 1; - *maxPage = wxHTML_PRINT_MAX_PAGES; + *maxPage = m_NumPages; *selPageFrom = 1; - *selPageTo = wxHTML_PRINT_MAX_PAGES; + *selPageTo = m_NumPages; } @@ -286,9 +292,26 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) return; } - wxHtmlFilterHTML filter; - wxString doc = filter.ReadFile(*ff); - + bool done = FALSE; + wxHtmlFilterHTML defaultFilter; + wxString doc; + + wxList::compatibility_iterator node = m_Filters.GetFirst(); + while (node) + { + wxHtmlFilter *h = (wxHtmlFilter*) node->GetData(); + if (h->CanRead(*ff)) + { + doc = h->ReadFile(*ff); + done = TRUE; + break; + } + node = node->GetNext(); + } + + if (!done) + doc = defaultFilter.ReadFile(*ff); + SetHtmlText(doc, htmlfile, FALSE); delete ff; } @@ -335,7 +358,7 @@ void wxHtmlPrintout::CountPages() { pos = m_Renderer->Render((int)( ppmm_h * m_MarginLeft), (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), - pos, TRUE); + pos, TRUE, INT_MAX, m_PageBreaks, m_NumPages); m_PageBreaks[++m_NumPages] = pos; } while (pos < m_Renderer->GetTotalHeight()); } @@ -358,8 +381,10 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) int ppiPrinterX, ppiPrinterY; GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); + wxUnusedVar(ppiPrinterX); int ppiScreenX, ppiScreenY; GetPPIScreen(&ppiScreenX, &ppiScreenY); + wxUnusedVar(ppiScreenX); dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); @@ -369,7 +394,7 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) m_Renderer->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), - m_PageBreaks[page-1]); + 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) @@ -428,9 +453,9 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face, //---------------------------------------------------------------------------- -wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxFrame *parent_frame) +wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWindow) { - m_Frame = parent_frame; + m_ParentWindow = parentWindow; m_Name = name; m_PrintData = new wxPrintData; m_PageSetupData = new wxPageSetupDialogData; @@ -508,7 +533,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr return FALSE; } - wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame, + wxPreviewFrame *frame = new wxPreviewFrame(preview, m_ParentWindow, m_Name + _(" Preview"), wxPoint(100, 100), wxSize(650, 500)); frame->Centre(wxBOTH); @@ -524,7 +549,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) wxPrintDialogData printDialogData(*m_PrintData); wxPrinter printer(&printDialogData); - if (!printer.Print(m_Frame, printout, TRUE)) + if (!printer.Print(m_ParentWindow, printout, TRUE)) { return FALSE; } @@ -538,7 +563,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) void wxHtmlEasyPrinting::PrinterSetup() { wxPrintDialogData printDialogData(*m_PrintData); - wxPrintDialog printerDialog(m_Frame, &printDialogData); + wxPrintDialog printerDialog(m_ParentWindow, &printDialogData); printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); @@ -557,7 +582,7 @@ void wxHtmlEasyPrinting::PageSetup() } m_PageSetupData->SetPrintData(*m_PrintData); - wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData); + wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData); if (pageSetupDialog.ShowModal() == wxID_OK) { @@ -622,6 +647,21 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout() return p; } +// A module to allow initialization/cleanup +// without calling these functions from app.cpp or from +// the user's application. + +class wxHtmlPrintingModule: public wxModule +{ +DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule) +public: + wxHtmlPrintingModule() : wxModule() {} + bool OnInit() { return TRUE; } + void OnExit() { wxHtmlPrintout::CleanUpStatics(); } +}; + +IMPLEMENT_DYNAMIC_CLASS(wxHtmlPrintingModule, wxModule) + // This hack forces the linker to always link in m_* files // (wxHTML doesn't work without handlers from these files)