X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edbd0635f283adfe7aeb5c551e199493d05b6cf5..fcdb9b388a28bfdd7083ae5357b5427dac2429bf:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index ef8c0b5a23..121503447e 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -10,7 +10,7 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "htmprint.h" #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -23,11 +23,14 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/log.h" + #include "wx/intl.h" + #include "wx/dc.h" #endif -#if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE +#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS +#include "wx/dc.h" #include "wx/print.h" #include "wx/printdlg.h" #include "wx/html/htmprint.h" @@ -47,7 +50,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject() m_Cells = NULL; m_Parser = new wxHtmlWinParser(NULL); m_FS = new wxFileSystem(); - m_Parser -> SetFS(m_FS); + m_Parser->SetFS(m_FS); } @@ -64,7 +67,7 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer() void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale) { m_DC = dc; - m_Parser -> SetDC(m_DC, pixel_scale); + m_Parser->SetDC(m_DC, pixel_scale); } @@ -76,42 +79,54 @@ void wxHtmlDCRenderer::SetSize(int width, int height) } - void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepath, bool isdir) { if (m_DC == NULL) return; if (m_Cells != NULL) delete m_Cells; - - m_FS -> ChangePathTo(basepath, isdir); - m_Cells = (wxHtmlContainerCell*) m_Parser -> Parse(html); - m_Cells -> SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); - m_Cells -> Layout(m_Width); + + m_FS->ChangePathTo(basepath, isdir); + m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html); + m_Cells->SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS); + m_Cells->Layout(m_Width); } +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 (!dont_render) { - 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*/)); - m_DC -> DestroyClippingRegion(); + 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*/), + rinfo); + m_DC->DestroyClippingRegion(); } - - if (pbreak < m_Cells -> GetHeight()) return pbreak; + + if (pbreak < m_Cells->GetHeight()) return pbreak; else return GetTotalHeight(); } @@ -119,7 +134,7 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render) int wxHtmlDCRenderer::GetTotalHeight() { - if (m_Cells) return m_Cells -> GetHeight(); + if (m_Cells) return m_Cells->GetHeight(); else return 0; } @@ -170,7 +185,7 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) { 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); @@ -184,41 +199,45 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) GetPPIScreen(&ppiScreenX, &ppiScreenY); wxDisplaySize(&scr_w, &scr_h); - GetDC() -> GetSize(&dc_w, &dc_h); + GetDC()->GetSize(&dc_w, &dc_h); - GetDC() -> SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); + GetDC()->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); /* prepare headers/footers renderer: */ - - m_RendererHdr -> SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY); - m_RendererHdr -> SetSize(ppmm_h * (mm_w - m_MarginLeft - m_MarginTop), - ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)); - if (m_Headers[0] != wxEmptyString) { - m_RendererHdr -> SetHtmlText(TranslateHeader(m_Headers[0], 1)); - m_HeaderHeight = m_RendererHdr -> GetTotalHeight(); + + m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY); + m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)), + (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom))); + if (m_Headers[0] != wxEmptyString) + { + m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[0], 1)); + m_HeaderHeight = m_RendererHdr->GetTotalHeight(); } - else if (m_Headers[1] != wxEmptyString) { - m_RendererHdr -> SetHtmlText(TranslateHeader(m_Headers[1], 1)); - m_HeaderHeight = m_RendererHdr -> GetTotalHeight(); + else if (m_Headers[1] != wxEmptyString) + { + m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[1], 1)); + m_HeaderHeight = m_RendererHdr->GetTotalHeight(); } - if (m_Footers[0] != wxEmptyString) { - m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[0], 1)); - m_FooterHeight = m_RendererHdr -> GetTotalHeight(); + if (m_Footers[0] != wxEmptyString) + { + m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[0], 1)); + m_FooterHeight = m_RendererHdr->GetTotalHeight(); } - else if (m_Footers[1] != wxEmptyString) { - m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[1], 1)); - m_FooterHeight = m_RendererHdr -> GetTotalHeight(); + else if (m_Footers[1] != wxEmptyString) + { + m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[1], 1)); + m_FooterHeight = m_RendererHdr->GetTotalHeight(); } - + /* prepare main renderer: */ - m_Renderer -> SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY); - m_Renderer -> SetSize(ppmm_h * (mm_w - m_MarginLeft - m_MarginTop), - ppmm_v * (mm_h - m_MarginTop - m_MarginBottom) - + m_Renderer->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY); + m_Renderer->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)), + (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom) - m_FooterHeight - m_HeaderHeight - ((m_HeaderHeight == 0) ? 0 : m_MarginSpace * ppmm_v) - ((m_FooterHeight == 0) ? 0 : m_MarginSpace * ppmm_v) - ); - m_Renderer -> SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir); + )); + m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir); CountPages(); return TRUE; } @@ -227,12 +246,13 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) bool wxHtmlPrintout::OnPrintPage(int page) { wxDC *dc = GetDC(); - if (dc) { + if (dc) + { if (HasPage(page)) RenderPage(dc, page); return TRUE; - } else - return FALSE; + } + else return FALSE; } @@ -260,31 +280,31 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath, m_BasePathIsDir = isdir; } - - void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) { wxFileSystem fs; wxFSFile *ff = fs.OpenFile(htmlfile); - wxInputStream *st = ff -> GetStream(); - char *t = new char[st -> GetSize() + 1]; - st -> Read(t, st -> GetSize()); - t[st -> GetSize()] = 0; - - wxString doc = wxString(t); - delete t; - delete ff; + + if (ff == NULL) + { + wxLogError(htmlfile + _(": file does not exist!")); + return; + } + + wxHtmlFilterHTML filter; + wxString doc = filter.ReadFile(*ff); SetHtmlText(doc, htmlfile, FALSE); + delete ff; } void wxHtmlPrintout::SetHeader(const wxString& header, int pg) { - if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) + if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) m_Headers[0] = header; - if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) + if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) m_Headers[1] = header; } @@ -292,9 +312,9 @@ void wxHtmlPrintout::SetHeader(const wxString& header, int pg) void wxHtmlPrintout::SetFooter(const wxString& footer, int pg) { - if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) + if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) m_Footers[0] = footer; - if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) + if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) m_Footers[1] = footer; } @@ -314,14 +334,15 @@ void wxHtmlPrintout::CountPages() int pos = 0; m_NumPages = 0; - + m_PageBreaks[0] = 0; - do { - pos = m_Renderer -> Render(ppmm_h * m_MarginLeft, - ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight, - pos, TRUE); + 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; - } while (pos < m_Renderer -> GetTotalHeight()); + } while (pos < m_Renderer->GetTotalHeight()); } @@ -338,31 +359,33 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) ppmm_h = (float)pageWidth / mm_w; ppmm_v = (float)pageHeight / mm_h; wxDisplaySize(&scr_w, &scr_h); - dc -> GetSize(&dc_w, &dc_h); + dc->GetSize(&dc_w, &dc_h); int ppiPrinterX, ppiPrinterY; GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); int ppiScreenX, ppiScreenY; GetPPIScreen(&ppiScreenX, &ppiScreenY); - dc -> SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); - - m_Renderer -> SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY); - - dc -> SetBackgroundMode(wxTRANSPARENT); + dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); - m_Renderer -> Render(ppmm_h * m_MarginLeft, - ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight, - 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(ppmm_h * m_MarginLeft, ppmm_v * m_MarginTop); + m_Renderer->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY); + + dc->SetBackgroundMode(wxTRANSPARENT); + + 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], 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)); } - if (m_Footers[page % 2] != wxEmptyString) { - m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[page % 2], page)); - m_RendererHdr -> Render(ppmm_h * m_MarginLeft, pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight); + 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)); } } @@ -372,7 +395,7 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page) { wxString r = instr; wxString num; - + num.Printf(wxT("%i"), page); r.Replace(wxT("@PAGENUM@"), num); @@ -396,27 +419,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)); + + m_PageSetupData->EnableMargins(TRUE); + m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25)); + m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25)); + + SetFonts(wxEmptyString, wxEmptyString, NULL); } @@ -429,77 +458,84 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting() -void wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) +bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) { wxHtmlPrintout *p1 = CreatePrintout(); - p1 -> SetHtmlFile(htmlfile); + p1->SetHtmlFile(htmlfile); wxHtmlPrintout *p2 = CreatePrintout(); - p2 -> SetHtmlFile(htmlfile); - DoPreview(p1, p2); + p2->SetHtmlFile(htmlfile); + return DoPreview(p1, p2); } -void wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath) +bool wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath) { wxHtmlPrintout *p1 = CreatePrintout(); - p1 -> SetHtmlText(htmltext, basepath, TRUE); + p1->SetHtmlText(htmltext, basepath, TRUE); wxHtmlPrintout *p2 = CreatePrintout(); - p2 -> SetHtmlText(htmltext, basepath, TRUE); - DoPreview(p1, p2); + p2->SetHtmlText(htmltext, basepath, TRUE); + return DoPreview(p1, p2); } -void wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile) +bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile) { wxHtmlPrintout *p = CreatePrintout(); - p -> SetHtmlFile(htmlfile); - DoPrint(p); + p->SetHtmlFile(htmlfile); + bool ret = DoPrint(p); + delete p; + return ret; } -void wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath) +bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath) { wxHtmlPrintout *p = CreatePrintout(); - p -> SetHtmlText(htmltext, basepath, TRUE); - DoPrint(p); + p->SetHtmlText(htmltext, basepath, TRUE); + bool ret = DoPrint(p); + delete p; + return ret; } -void wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2) +bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2) { // Pass two printout objects: for preview, and possible printing. wxPrintDialogData printDialogData(*m_PrintData); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); - if (!preview -> Ok()) { + if (!preview->Ok()) + { delete preview; - wxMessageBox(_("There was a problem previewing.\nPerhaps your current printer is not set correctly?"), _("Previewing"), wxOK); - } - - else { - wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame, - m_Name + _(" Preview"), - wxPoint(100, 100), wxSize(650, 500)); - frame -> Centre(wxBOTH); - frame -> Initialize(); - frame -> Show(TRUE); + return FALSE; } + + wxPreviewFrame *frame = new wxPreviewFrame(preview, m_ParentWindow, + m_Name + _(" Preview"), + wxPoint(100, 100), wxSize(650, 500)); + frame->Centre(wxBOTH); + frame->Initialize(); + frame->Show(TRUE); + return TRUE; } -void wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) +bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) { wxPrintDialogData printDialogData(*m_PrintData); wxPrinter printer(&printDialogData); - if (!printer.Print(m_Frame, printout, TRUE)) - wxMessageBox(_("There was a problem printing.\nPerhaps your current printer is not set correctly?"), _("Printing"), wxOK); - else - (*m_PrintData) = printer.GetPrintDialogData().GetPrintData(); + if (!printer.Print(m_ParentWindow, printout, TRUE)) + { + return FALSE; + } + + (*m_PrintData) = printer.GetPrintDialogData().GetPrintData(); + return TRUE; } @@ -507,8 +543,8 @@ void 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); if (printerDialog.ShowModal() == wxID_OK) @@ -519,10 +555,17 @@ void wxHtmlEasyPrinting::PrinterSetup() void wxHtmlEasyPrinting::PageSetup() { - m_PageSetupData -> SetPrintData(*m_PrintData); - wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData); + if (!m_PrintData->Ok()) + { + wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); + return; + } - if (pageSetupDialog.ShowModal() == wxID_OK) { + m_PageSetupData->SetPrintData(*m_PrintData); + wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData); + + if (pageSetupDialog.ShowModal() == wxID_OK) + { (*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData(); (*m_PageSetupData) = pageSetupDialog.GetPageSetupData(); } @@ -532,9 +575,9 @@ void wxHtmlEasyPrinting::PageSetup() void wxHtmlEasyPrinting::SetHeader(const wxString& header, int pg) { - if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) + if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) m_Headers[0] = header; - if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) + if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) m_Headers[1] = header; } @@ -542,31 +585,52 @@ void wxHtmlEasyPrinting::SetHeader(const wxString& header, int pg) void wxHtmlEasyPrinting::SetFooter(const wxString& footer, int pg) { - if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) + if (pg == wxPAGE_ALL || pg == wxPAGE_EVEN) m_Footers[0] = footer; - if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) + if (pg == wxPAGE_ALL || pg == wxPAGE_ODD) m_Footers[1] = footer; } +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 -> SetHeader(m_Headers[0], wxPAGE_EVEN); - p -> SetHeader(m_Headers[1], wxPAGE_ODD); - p -> SetFooter(m_Footers[0], wxPAGE_EVEN); - p -> SetFooter(m_Footers[1], wxPAGE_ODD); - - p -> SetMargins(m_PageSetupData -> GetMarginTopLeft().y, - m_PageSetupData -> GetMarginBottomRight().y, - m_PageSetupData -> GetMarginTopLeft().x, - m_PageSetupData -> GetMarginBottomRight().x); - + + 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); + p->SetFooter(m_Footers[1], wxPAGE_ODD); + + p->SetMargins(m_PageSetupData->GetMarginTopLeft().y, + m_PageSetupData->GetMarginBottomRight().y, + m_PageSetupData->GetMarginTopLeft().x, + m_PageSetupData->GetMarginBottomRight().x); + return p; } +// This hack forces the linker to always link in m_* files +// (wxHTML doesn't work without handlers from these files) +#include "wx/html/forcelnk.h" +FORCE_WXHTML_MODULES() #endif // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE