X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2b354f9c9f1473b2d6ff0ab643ebf57dcbfb656..907173e51df6d2a91d65463ddf6ce810d3fd921a:/src/html/htmprint.cpp?ds=sidebyside diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 1206f2f870..e3c7c82948 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 @@ -37,6 +37,7 @@ #include "wx/wxhtml.h" #include "wx/wfstream.h" #include "wx/module.h" +#include "wx/settings.h" //-------------------------------------------------------------------------------- @@ -97,7 +98,17 @@ 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); + if (m_DC == NULL && m_Cells != NULL) + m_Cells->Layout(m_Width); +} + +void wxHtmlDCRenderer::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) +{ + m_Parser->SetStandardFonts(size, normal_face, fixed_face); + if (m_DC == NULL && m_Cells != NULL) + m_Cells->Layout(m_Width); } @@ -152,7 +163,7 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title) m_Renderer = new wxHtmlDCRenderer; m_RendererHdr = new wxHtmlDCRenderer; m_NumPages = wxHTML_PRINT_MAX_PAGES; - m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = TRUE; + m_Document = m_BasePath = wxEmptyString; m_BasePathIsDir = true; m_Headers[0] = m_Headers[1] = wxEmptyString; m_Footers[0] = m_Footers[1] = wxEmptyString; m_HeaderHeight = m_FooterHeight = 0; @@ -238,9 +249,9 @@ void wxHtmlPrintout::OnPreparePrinting() bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage) { - if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE; + if (!wxPrintout::OnBeginDocument(startPage, endPage)) return false; - return TRUE; + return true; } @@ -251,9 +262,9 @@ bool wxHtmlPrintout::OnPrintPage(int page) { if (HasPage(page)) RenderPage(dc, page); - return TRUE; + return true; } - else return FALSE; + else return false; } @@ -284,7 +295,12 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath, void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) { wxFileSystem fs; - wxFSFile *ff = fs.OpenFile(htmlfile); + wxFSFile *ff; + + if (wxFileExists(htmlfile)) + ff = fs.OpenFile(wxFileSystem::FileNameToURL(htmlfile)); + else + ff = fs.OpenFile(htmlfile); if (ff == NULL) { @@ -292,7 +308,7 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) return; } - bool done = FALSE; + bool done = false; wxHtmlFilterHTML defaultFilter; wxString doc; @@ -303,7 +319,7 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) if (h->CanRead(*ff)) { doc = h->ReadFile(*ff); - done = TRUE; + done = true; break; } node = node->GetNext(); @@ -311,8 +327,8 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) if (!done) doc = defaultFilter.ReadFile(*ff); - - SetHtmlText(doc, htmlfile, FALSE); + + SetHtmlText(doc, htmlfile, false); delete ff; } @@ -358,7 +374,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, INT_MAX, m_PageBreaks, m_NumPages); + pos, true, INT_MAX, m_PageBreaks, m_NumPages); m_PageBreaks[++m_NumPages] = pos; } while (pos < m_Renderer->GetTotalHeight()); } @@ -381,8 +397,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); @@ -392,7 +410,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], FALSE, m_PageBreaks[page]-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) @@ -444,6 +462,14 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face, m_RendererHdr->SetFonts(normal_face, fixed_face, sizes); } +void wxHtmlPrintout::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) +{ + m_Renderer->SetStandardFonts(size, normal_face, fixed_face); + m_RendererHdr->SetStandardFonts(size, normal_face, fixed_face); +} + //---------------------------------------------------------------------------- @@ -455,11 +481,11 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin { m_ParentWindow = parentWindow; m_Name = name; - m_PrintData = new wxPrintData; + m_PrintData = NULL; m_PageSetupData = new wxPageSetupDialogData; m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString; - m_PageSetupData->EnableMargins(TRUE); + m_PageSetupData->EnableMargins(true); m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25)); m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25)); @@ -475,6 +501,13 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting() } +wxPrintData *wxHtmlEasyPrinting::GetPrintData() +{ + if (m_PrintData == NULL) + m_PrintData = new wxPrintData(); + return m_PrintData; +} + bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) { @@ -490,9 +523,9 @@ bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) 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); + p2->SetHtmlText(htmltext, basepath, true); return DoPreview(p1, p2); } @@ -512,7 +545,7 @@ bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile) bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath) { wxHtmlPrintout *p = CreatePrintout(); - p->SetHtmlText(htmltext, basepath, TRUE); + p->SetHtmlText(htmltext, basepath, true); bool ret = DoPrint(p); delete p; return ret; @@ -523,12 +556,12 @@ bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &bas bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2) { // Pass two printout objects: for preview, and possible printing. - wxPrintDialogData printDialogData(*m_PrintData); + wxPrintDialogData printDialogData(*GetPrintData()); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); if (!preview->Ok()) { delete preview; - return FALSE; + return false; } wxPreviewFrame *frame = new wxPreviewFrame(preview, m_ParentWindow, @@ -536,55 +569,55 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr wxPoint(100, 100), wxSize(650, 500)); frame->Centre(wxBOTH); frame->Initialize(); - frame->Show(TRUE); - return TRUE; + frame->Show(true); + return true; } bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) { - wxPrintDialogData printDialogData(*m_PrintData); + wxPrintDialogData printDialogData(*GetPrintData()); wxPrinter printer(&printDialogData); - if (!printer.Print(m_ParentWindow, printout, TRUE)) + if (!printer.Print(m_ParentWindow, printout, true)) { - return FALSE; + return false; } - (*m_PrintData) = printer.GetPrintDialogData().GetPrintData(); - return TRUE; + (*GetPrintData()) = printer.GetPrintDialogData().GetPrintData(); + return true; } void wxHtmlEasyPrinting::PrinterSetup() { - wxPrintDialogData printDialogData(*m_PrintData); + wxPrintDialogData printDialogData(*GetPrintData()); wxPrintDialog printerDialog(m_ParentWindow, &printDialogData); - printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); + printerDialog.GetPrintDialogData().SetSetupDialog(true); if (printerDialog.ShowModal() == wxID_OK) - (*m_PrintData) = printerDialog.GetPrintDialogData().GetPrintData(); + (*GetPrintData()) = printerDialog.GetPrintDialogData().GetPrintData(); } void wxHtmlEasyPrinting::PageSetup() { - if (!m_PrintData->Ok()) + if (!GetPrintData()->Ok()) { wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); return; } - m_PageSetupData->SetPrintData(*m_PrintData); + m_PageSetupData->SetPrintData(*GetPrintData()); wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData); if (pageSetupDialog.ShowModal() == wxID_OK) { - (*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData(); + (*GetPrintData()) = pageSetupDialog.GetPageSetupData().GetPrintData(); (*m_PageSetupData) = pageSetupDialog.GetPageSetupData(); } } @@ -613,6 +646,7 @@ void wxHtmlEasyPrinting::SetFooter(const wxString& footer, int pg) void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes) { + m_fontMode = FontMode_Explicit; m_FontFaceNormal = normal_face; m_FontFaceFixed = fixed_face; @@ -625,12 +659,30 @@ void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face, m_FontsSizes = NULL; } +void wxHtmlEasyPrinting::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) +{ + m_fontMode = FontMode_Standard; + m_FontFaceNormal = normal_face; + m_FontFaceFixed = fixed_face; + m_FontsSizesArr[0] = size; +} + wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout() { wxHtmlPrintout *p = new wxHtmlPrintout(m_Name); - p->SetFonts(m_FontFaceNormal, m_FontFaceFixed, m_FontsSizes); + if (m_fontMode == FontMode_Explicit) + { + p->SetFonts(m_FontFaceNormal, m_FontFaceFixed, m_FontsSizes); + } + else // FontMode_Standard + { + p->SetStandardFonts(m_FontsSizesArr[0], + m_FontFaceNormal, m_FontFaceFixed); + } p->SetHeader(m_Headers[0], wxPAGE_EVEN); p->SetHeader(m_Headers[1], wxPAGE_ODD); @@ -654,7 +706,7 @@ class wxHtmlPrintingModule: public wxModule DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule) public: wxHtmlPrintingModule() : wxModule() {} - bool OnInit() { return TRUE; } + bool OnInit() { return true; } void OnExit() { wxHtmlPrintout::CleanUpStatics(); } };