// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
+#include "wx/defs.h"
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/log.h"
+ #include "wx/intl.h"
+ #include "wx/dc.h"
#endif
-#if 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"
m_Cells = NULL;
m_Parser = new wxHtmlWinParser(NULL);
m_FS = new wxFileSystem();
- m_Parser -> SetFS(m_FS);
- m_Scale = 1.0;
+ m_Parser->SetFS(m_FS);
}
-void wxHtmlDCRenderer::SetDC(wxDC *dc, int maxwidth)
+void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale)
{
- int dx, dy;
-
- wxDisplaySize(&dx, &dy);
- m_MaxWidth = maxwidth;
-#if 0
- m_Scale = (float)dx * 2 / 3 / (float)maxwidth;
- // let the width of A4 is approximately 2/3 the screen width
-#endif
- m_Scale = (float)800 / (float)maxwidth;
- // for now, assume screen width = 800 => good results
-
m_DC = dc;
- m_Parser -> SetDC(dc);
+ m_Parser->SetDC(m_DC, pixel_scale);
}
void wxHtmlDCRenderer::SetSize(int width, int height)
{
- m_Width = (int)(width * m_Scale);
- m_Height = (int)(height * m_Scale);
+ m_Width = width;
+ m_Height = height;
}
if (m_DC == NULL) return;
if (m_Cells != NULL) delete m_Cells;
-
- m_FS -> ChangePathTo(basepath, isdir);
- m_DC -> SetUserScale(1.0, 1.0);
- m_Cells = (wxHtmlContainerCell*) m_Parser -> Parse(html);
- m_Cells -> SetIndent(0, HTML_INDENT_ALL, HTML_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);
}
int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render)
{
- int pbreak;
-
+ int pbreak, hght;
+
if (m_Cells == NULL || m_DC == NULL) return 0;
-
- pbreak = (int)(from * m_Scale + m_Height);
- while (m_Cells -> AdjustPagebreak(&pbreak)) {}
-
- if (!dont_render) {
- int w, h;
- m_DC -> GetSize(&w, &h);
- float overallScale = (float)(w/(float)m_MaxWidth) / m_Scale;
- m_DC -> SetUserScale(overallScale, overallScale);
-
- m_DC -> SetBrush(*wxWHITE_BRUSH);
-
- m_DC -> SetClippingRegion(x * m_Scale, y * m_Scale, m_Width, m_Height);
- m_Cells -> Draw(*m_DC,
- x * m_Scale, (y - from) * m_Scale,
- y * m_Scale, pbreak + (y - from) * m_Scale);
- m_DC -> DestroyClippingRegion();
+
+ pbreak = (int)(from + m_Height);
+ while (m_Cells->AdjustPagebreak(&pbreak)) {}
+ 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 (pbreak < m_Cells -> GetHeight()) return (int)(pbreak / m_Scale);
+
+ if (pbreak < m_Cells->GetHeight()) return pbreak;
else return GetTotalHeight();
}
int wxHtmlDCRenderer::GetTotalHeight()
{
- if (m_Cells) return (int)(m_Cells -> GetHeight() / m_Scale);
+ if (m_Cells) return m_Cells->GetHeight();
else return 0;
}
{
m_Renderer = new wxHtmlDCRenderer;
m_RendererHdr = new wxHtmlDCRenderer;
- m_NumPages = HTML_PRINT_MAX_PAGES;
+ m_NumPages = wxHTML_PRINT_MAX_PAGES;
m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = TRUE;
m_Headers[0] = m_Headers[1] = wxEmptyString;
m_Footers[0] = m_Footers[1] = wxEmptyString;
-bool wxHtmlPrintout::OnBeginDocument(int start, int end)
+bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
{
- int pageWidth, pageHeight, mm_w, mm_h;
+ int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
float ppmm_h, ppmm_v;
-
- if (!wxPrintout::OnBeginDocument(start, end)) return FALSE;
+
+ if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE;
GetPageSizePixels(&pageWidth, &pageHeight);
GetPageSizeMM(&mm_w, &mm_h);
ppmm_h = (float)pageWidth / mm_w;
ppmm_v = (float)pageHeight / mm_h;
+ int ppiPrinterX, ppiPrinterY;
+ GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+ int ppiScreenX, ppiScreenY;
+ GetPPIScreen(&ppiScreenX, &ppiScreenY);
+
+ wxDisplaySize(&scr_w, &scr_h);
+ GetDC()->GetSize(&dc_w, &dc_h);
+
+ GetDC()->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
+
/* prepare headers/footers renderer: */
-
- m_RendererHdr -> SetDC(GetDC(), pageWidth);
- 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(), pageWidth);
- 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;
}
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;
}
void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
{
*minPage = 1;
- *maxPage = HTML_PRINT_MAX_PAGES;
+ *maxPage = wxHTML_PRINT_MAX_PAGES;
*selPageFrom = 1;
- *selPageTo = 1;
+ *selPageTo = wxHTML_PRINT_MAX_PAGES;
}
{
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;
-
+
+ if (ff == NULL)
+ {
+ wxLogError(htmlfile + _(": file does not exist!"));
+ return;
+ }
+
+ 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;
-
+
SetHtmlText(doc, htmlfile, FALSE);
}
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;
}
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;
}
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,
+ 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);
m_PageBreaks[++m_NumPages] = pos;
- } while (pos < m_Renderer -> GetTotalHeight());
+ } while (pos < m_Renderer->GetTotalHeight());
}
{
wxBusyCursor wait;
- int pageWidth, pageHeight, mm_w, mm_h;
+ int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
float ppmm_h, ppmm_v;
GetPageSizePixels(&pageWidth, &pageHeight);
GetPageSizeMM(&mm_w, &mm_h);
ppmm_h = (float)pageWidth / mm_w;
ppmm_v = (float)pageHeight / mm_h;
-
- m_Renderer -> SetDC(dc, pageWidth);
+ wxDisplaySize(&scr_w, &scr_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->SetBackgroundMode(wxTRANSPARENT);
- m_Renderer -> Render(ppmm_h * m_MarginLeft,
- ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight,
+ 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_RendererHdr -> SetDC(dc, pageWidth);
- 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_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));
}
}
{
wxString r = instr;
wxString num;
-
- num.Printf("%i", page);
- r.Replace("@PAGENUM@", num);
- num.Printf("%i", m_NumPages);
- r.Replace("@PAGESCNT@", num);
+ num.Printf(wxT("%i"), page);
+ r.Replace(wxT("@PAGENUM@"), num);
+
+ num.Printf(wxT("%i"), m_NumPages);
+ r.Replace(wxT("@PAGESCNT@"), num);
return r;
}
m_Frame = parent_frame;
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));
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
- m_PrintData -> SetPrinterCommand("lpr");
-#endif
+ m_PageSetupData->EnableMargins(TRUE);
+ m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25));
+ m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25));
}
-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(500, 500));
- frame -> Centre(wxBOTH);
- frame -> Initialize();
- frame -> Show(TRUE);
+ return FALSE;
}
+
+ 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 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();
+ {
+ return FALSE;
+ }
+
+ (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
+ return TRUE;
}
{
wxPrintDialogData printDialogData(*m_PrintData);
wxPrintDialog printerDialog(m_Frame, &printDialogData);
-
+
printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
if (printerDialog.ShowModal() == wxID_OK)
void wxHtmlEasyPrinting::PageSetup()
{
- m_PageSetupData -> SetPrintData(*m_PrintData);
+ m_PageSetupData->SetPrintData(*m_PrintData);
wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
- if (pageSetupDialog.ShowModal() == wxID_OK) {
+ if (pageSetupDialog.ShowModal() == wxID_OK)
+ {
(*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData();
(*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
}
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;
}
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;
}
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->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_PRINTING_ARCHITECTURE
+#endif // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
projects / wxWidgets.git / blobdiff