X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4af5cca4a3838e4c89a5badd63f8d309fe1ed91f..7ab0c3adb780464f2ee58f88d2443f5a79a2c401:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 8cd032ff03..6f4912caee 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -26,7 +26,6 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/dc.h" - #include "wx/msgdlg.h" #endif #if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS @@ -37,6 +36,7 @@ #include "wx/html/htmprint.h" #include "wx/wxhtml.h" #include "wx/wfstream.h" +#include "wx/module.h" //-------------------------------------------------------------------------------- @@ -80,7 +80,6 @@ void wxHtmlDCRenderer::SetSize(int width, int height) } - void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepath, bool isdir) { if (m_DC == NULL) return; @@ -94,25 +93,37 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat } +void wxHtmlDCRenderer::SetFonts(wxString normal_face, wxString fixed_face, + const int *sizes) +{ + m_Parser->SetFonts(normal_face, fixed_face, sizes); + if (m_DC == NULL && m_Cells != NULL) m_Cells->Layout(m_Width); +} + -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(); } @@ -129,25 +140,12 @@ int wxHtmlDCRenderer::GetTotalHeight() } - - - - - - - - - - - - - - //-------------------------------------------------------------------------------- // wxHtmlPrintout //-------------------------------------------------------------------------------- +wxList wxHtmlPrintout::m_Filters; wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title) { @@ -169,7 +167,17 @@ wxHtmlPrintout::~wxHtmlPrintout() delete m_RendererHdr; } +void wxHtmlPrintout::CleanUpStatics() +{ + m_Filters.DeleteContents(TRUE); + m_Filters.Clear(); +} +// Adds input filter +void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter) +{ + m_Filters.Append(filter); +} bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) { @@ -270,9 +278,6 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath, m_BasePathIsDir = isdir; } -// defined in htmlfilt.cpp -void wxPrivate_ReadString(wxString& str, wxInputStream* s); - void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) { wxFileSystem fs; @@ -284,13 +289,28 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) return; } - wxInputStream *st = ff->GetStream(); + bool done = FALSE; + wxHtmlFilterHTML defaultFilter; wxString doc; - wxPrivate_ReadString(doc, st); - delete ff; + wxNode* 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 +355,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()); } @@ -369,7 +389,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) @@ -414,27 +434,33 @@ void wxHtmlPrintout::SetMargins(float top, float bottom, float left, float right +void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face, + const int *sizes) +{ + m_Renderer->SetFonts(normal_face, fixed_face, sizes); + m_RendererHdr->SetFonts(normal_face, fixed_face, sizes); +} + -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxHtmlEasyPrinting -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- -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; -#if (defined __WXGTK__) || (defined __WXMOTIF__) - (*m_PrintData) = (*wxThePrintSetupData); -#endif m_PageSetupData = new wxPageSetupDialogData; m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString; m_PageSetupData->EnableMargins(TRUE); m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25)); m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25)); + + SetFonts(wxEmptyString, wxEmptyString, NULL); } @@ -502,7 +528,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); @@ -518,7 +544,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; } @@ -532,7 +558,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); @@ -546,13 +572,12 @@ void wxHtmlEasyPrinting::PageSetup() { if (!m_PrintData->Ok()) { - wxMessageBox(_("Sorry, there was a problem: you may need to set a default printer."), - _("Page Setup Problem"), wxICON_INFORMATION|wxOK, m_Frame); + wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); return; } m_PageSetupData->SetPrintData(*m_PrintData); - wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData); + wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData); if (pageSetupDialog.ShowModal() == wxID_OK) { @@ -582,11 +607,28 @@ void wxHtmlEasyPrinting::SetFooter(const wxString& footer, int pg) } +void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face, + const int *sizes) +{ + m_FontFaceNormal = normal_face; + m_FontFaceFixed = fixed_face; + + if (sizes) + { + m_FontsSizes = m_FontsSizesArr; + for (int i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i]; + } + else + m_FontsSizes = NULL; +} + wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout() { wxHtmlPrintout *p = new wxHtmlPrintout(m_Name); + p->SetFonts(m_FontFaceNormal, m_FontFaceFixed, m_FontsSizes); + p->SetHeader(m_Headers[0], wxPAGE_EVEN); p->SetHeader(m_Headers[1], wxPAGE_ODD); p->SetFooter(m_Footers[0], wxPAGE_EVEN); @@ -600,6 +642,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)