X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7acd36259b464d7139128f2e53acf04b3110eb71..960615f41009ac62e99f833afbec10d96bd2d2f9:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 800ca10d66..6a22f88547 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmprint.cpp +// Name: src/html/htmprint.cpp // Purpose: html printing classes // Author: Vaclav Slavik // Created: 25/09/99 @@ -8,36 +8,33 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmprint.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS + #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/intl.h" #include "wx/dc.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/module.h" #endif -#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" #include "wx/wxhtml.h" #include "wx/wfstream.h" -#include "wx/module.h" -#include "wx/settings.h" + + +// default font size of normal text (HTML font size 0) for printing, in points: +#define DEFAULT_PRINT_FONT_SIZE 12 //-------------------------------------------------------------------------------- @@ -50,9 +47,10 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject() m_DC = NULL; m_Width = m_Height = 0; m_Cells = NULL; - m_Parser = new wxHtmlWinParser(NULL); + m_Parser = new wxHtmlWinParser(); m_FS = new wxFileSystem(); m_Parser->SetFS(m_FS); + SetStandardFonts(DEFAULT_PRINT_FONT_SIZE); } @@ -76,6 +74,9 @@ void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale) void wxHtmlDCRenderer::SetSize(int width, int height) { + wxCHECK_RET( width, "width must be non-zero" ); + wxCHECK_RET( height, "height must be non-zero" ); + m_Width = width; m_Height = height; } @@ -83,9 +84,10 @@ void wxHtmlDCRenderer::SetSize(int width, int height) void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepath, bool isdir) { - if (m_DC == NULL) return; + wxCHECK_RET( m_DC, "SetDC() must be called before SetHtmlText()" ); + wxCHECK_RET( m_Width, "SetSize() must be called before SetHtmlText()" ); - if (m_Cells != NULL) delete m_Cells; + wxDELETE(m_Cells); m_FS->ChangePathTo(basepath, isdir); m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html); @@ -94,40 +96,38 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat } -void wxHtmlDCRenderer::SetFonts(wxString normal_face, wxString fixed_face, +void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const 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_Cells ) + m_Cells->Layout(m_Width); + // else: SetHtmlText() not yet called, no need for relayout +} -void wxHtmlDCRenderer::NormalizeFontSizes(int size) +void wxHtmlDCRenderer::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) { - int f_sizes[7]; - if (size == -1) - size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(); + m_Parser->SetStandardFonts(size, normal_face, fixed_face); - f_sizes[0] = int(size * 0.6); - f_sizes[1] = int(size * 0.8); - f_sizes[2] = size; - f_sizes[3] = int(size * 1.2); - f_sizes[4] = int(size * 1.4); - f_sizes[5] = int(size * 1.6); - f_sizes[6] = int(size * 1.8); - - SetFonts(wxEmptyString, wxEmptyString, f_sizes); + if ( m_Cells ) + m_Cells->Layout(m_Width); + // else: SetHtmlText() not yet called, no need for relayout } - -int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, int *known_pagebreaks, int number_of_pages) +int wxHtmlDCRenderer::Render(int x, int y, + wxArrayInt& known_pagebreaks, + int from, int dont_render, int to) { - int pbreak, hght; + wxCHECK_MSG( m_Cells, 0, "SetHtmlText() must be called before Render()" ); + wxCHECK_MSG( m_DC, 0, "SetDC() must be called before Render()" ); - if (m_Cells == NULL || m_DC == NULL) return 0; + int pbreak, hght; pbreak = (int)(from + m_Height); - while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks, number_of_pages)) {} + while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks)) {} hght = pbreak - from; if(to < hght) hght = to; @@ -141,7 +141,7 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in m_DC->SetClippingRegion(x, y, m_Width, hght); m_Cells->Draw(*m_DC, x, (y - from), - y, pbreak + (y /*- from*/), + y, y + hght, rinfo); m_DC->DestroyClippingRegion(); } @@ -150,12 +150,14 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in else return GetTotalHeight(); } +int wxHtmlDCRenderer::GetTotalWidth() const +{ + return m_Cells ? m_Cells->GetWidth() : 0; +} - -int wxHtmlDCRenderer::GetTotalHeight() +int wxHtmlDCRenderer::GetTotalHeight() const { - if (m_Cells) return m_Cells->GetHeight(); - else return 0; + return m_Cells ? m_Cells->GetHeight() : 0; } @@ -171,11 +173,12 @@ 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; SetMargins(); // to default values + SetStandardFonts(DEFAULT_PRINT_FONT_SIZE); } @@ -197,6 +200,40 @@ void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter) m_Filters.Append(filter); } +bool +wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const +{ + if ( docArea.x > pageArea.x ) + { + wxMessageDialog + dlg + ( + NULL, + wxString::Format + ( + _("The document \"%s\" doesn't fit on the page " + "horizontally and will be truncated if printed.\n" + "\n" + "Would you like to proceed with printing it nevertheless?"), + GetTitle() + ), + _("Printing"), + wxOK | wxCANCEL | wxCANCEL_DEFAULT | wxICON_QUESTION + ); + dlg.SetExtendedMessage + ( + _("If possible, try changing the layout parameters to " + "make the printout more narrow.") + ); + dlg.SetOKLabel(wxID_PRINT); + + if ( dlg.ShowModal() == wxID_CANCEL ) + return false; + } + + return true; +} + void wxHtmlPrintout::OnPreparePrinting() { int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h; @@ -209,13 +246,16 @@ void wxHtmlPrintout::OnPreparePrinting() int ppiPrinterX, ppiPrinterY; GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); + wxUnusedVar(ppiPrinterX); int ppiScreenX, ppiScreenY; GetPPIScreen(&ppiScreenX, &ppiScreenY); + wxUnusedVar(ppiScreenX); wxDisplaySize(&scr_w, &scr_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_h / (double)pageHeight); /* prepare headers/footers renderer: */ @@ -245,50 +285,66 @@ void wxHtmlPrintout::OnPreparePrinting() /* prepare main renderer: */ 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) - )); + + const int printAreaW = int(ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)); + int printAreaH = int(ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)); + if ( m_HeaderHeight ) + printAreaH -= int(m_HeaderHeight + m_MarginSpace * ppmm_v); + if ( m_FooterHeight ) + printAreaH -= int(m_FooterHeight + m_MarginSpace * ppmm_v); + + m_Renderer->SetSize(printAreaW, printAreaH); m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir); - CountPages(); + + if ( CheckFit(wxSize(printAreaW, printAreaH), + wxSize(m_Renderer->GetTotalWidth(), + m_Renderer->GetTotalHeight())) ) + { + // do paginate the document + CountPages(); + } + //else: if we don't call CountPages() m_PageBreaks remains empty and our + // GetPageInfo() will return 0 as max page and so nothing will be + // printed } 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; } bool wxHtmlPrintout::OnPrintPage(int page) { wxDC *dc = GetDC(); - if (dc) + if (dc && dc->IsOk()) { if (HasPage(page)) RenderPage(dc, page); - return TRUE; + return true; } - else return FALSE; + else return false; } void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) { *minPage = 1; - *maxPage = m_NumPages; + if ( m_NumPages >= (signed)m_PageBreaks.GetCount()-1) + *maxPage = m_NumPages; + else + *maxPage = (signed)m_PageBreaks.GetCount()-1; *selPageFrom = 1; - *selPageTo = m_NumPages; + *selPageTo = (signed)m_PageBreaks.GetCount()-1; } bool wxHtmlPrintout::HasPage(int pageNum) { - return (pageNum >= 1 && pageNum <= m_NumPages); + return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount(); } @@ -303,7 +359,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) { @@ -311,7 +372,7 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) return; } - bool done = FALSE; + bool done = false; wxHtmlFilterHTML defaultFilter; wxString doc; @@ -322,7 +383,7 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) if (h->CanRead(*ff)) { doc = h->ReadFile(*ff); - done = TRUE; + done = true; break; } node = node->GetNext(); @@ -330,8 +391,8 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile) if (!done) doc = defaultFilter.ReadFile(*ff); - - SetHtmlText(doc, htmlfile, FALSE); + + SetHtmlText(doc, htmlfile, false); delete ff; } @@ -369,16 +430,24 @@ void wxHtmlPrintout::CountPages() ppmm_v = (float)pageHeight / mm_h; int pos = 0; - m_NumPages = 0; + // m_PageBreaks[0] = 0; - m_PageBreaks[0] = 0; + m_PageBreaks.Clear(); + m_PageBreaks.Add( 0); 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; + (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), + m_PageBreaks, + pos, true, INT_MAX); + m_PageBreaks.Add( pos); + if( m_PageBreaks.GetCount() > wxHTML_PRINT_MAX_PAGES) + { + wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!"), + _("Warning"), wxCANCEL | wxICON_ERROR ); + break; + } } while (pos < m_Renderer->GetTotalHeight()); } @@ -405,26 +474,28 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page) GetPPIScreen(&ppiScreenX, &ppiScreenY); wxUnusedVar(ppiScreenX); - dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth); + dc->SetUserScale((double)dc_w / (double)pageWidth, + (double)dc_h / (double)pageHeight); m_Renderer->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY); - dc->SetBackgroundMode(wxTRANSPARENT); + dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); 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]); + (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight), m_PageBreaks, + 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)); + m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop), m_PageBreaks); } 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)); + m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight), m_PageBreaks); } } @@ -438,9 +509,15 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page) num.Printf(wxT("%i"), page); r.Replace(wxT("@PAGENUM@"), num); - num.Printf(wxT("%i"), m_NumPages); + num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.GetCount() - 1)); r.Replace(wxT("@PAGESCNT@"), num); + const wxDateTime now = wxDateTime::Now(); + r.Replace(wxT("@DATE@"), now.FormatDate()); + r.Replace(wxT("@TIME@"), now.FormatTime()); + + r.Replace(wxT("@TITLE@"), GetTitle()); + return r; } @@ -458,29 +535,19 @@ void wxHtmlPrintout::SetMargins(float top, float bottom, float left, float right -void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face, +void wxHtmlPrintout::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes) { m_Renderer->SetFonts(normal_face, fixed_face, sizes); m_RendererHdr->SetFonts(normal_face, fixed_face, sizes); } - -void wxHtmlPrintout::NormalizeFontSizes(int size) +void wxHtmlPrintout::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) { - int f_sizes[7]; - if (size == -1) - size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(); - - f_sizes[0] = int(size * 0.6); - f_sizes[1] = int(size * 0.8); - f_sizes[2] = size; - f_sizes[3] = int(size * 1.2); - f_sizes[4] = int(size * 1.4); - f_sizes[5] = int(size * 1.6); - f_sizes[6] = int(size * 1.8); - - SetFonts(wxEmptyString, wxEmptyString, f_sizes); + m_Renderer->SetStandardFonts(size, normal_face, fixed_face); + m_RendererHdr->SetStandardFonts(size, normal_face, fixed_face); } @@ -498,11 +565,11 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin 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)); - SetFonts(wxEmptyString, wxEmptyString, NULL); + SetStandardFonts(DEFAULT_PRINT_FONT_SIZE); } @@ -536,9 +603,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); } @@ -558,7 +625,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; @@ -574,7 +641,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr if (!preview->Ok()) { delete preview; - return FALSE; + return false; } wxPreviewFrame *frame = new wxPreviewFrame(preview, m_ParentWindow, @@ -582,8 +649,8 @@ 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; } @@ -593,29 +660,17 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) wxPrintDialogData printDialogData(*GetPrintData()); wxPrinter printer(&printDialogData); - if (!printer.Print(m_ParentWindow, printout, TRUE)) + if (!printer.Print(m_ParentWindow, printout, true)) { - return FALSE; + return false; } (*GetPrintData()) = printer.GetPrintDialogData().GetPrintData(); - return TRUE; + return true; } -void wxHtmlEasyPrinting::PrinterSetup() -{ - wxPrintDialogData printDialogData(*GetPrintData()); - wxPrintDialog printerDialog(m_ParentWindow, &printDialogData); - - printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); - - if (printerDialog.ShowModal() == wxID_OK) - (*GetPrintData()) = printerDialog.GetPrintDialogData().GetPrintData(); -} - - void wxHtmlEasyPrinting::PageSetup() { @@ -656,9 +711,10 @@ void wxHtmlEasyPrinting::SetFooter(const wxString& footer, int pg) } -void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face, +void wxHtmlEasyPrinting::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes) { + m_fontMode = FontMode_Explicit; m_FontFaceNormal = normal_face; m_FontFaceFixed = fixed_face; @@ -671,21 +727,14 @@ void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face, m_FontsSizes = NULL; } -void wxHtmlEasyPrinting::NormalizeFontSizes(int size) +void wxHtmlEasyPrinting::SetStandardFonts(int size, + const wxString& normal_face, + const wxString& fixed_face) { - int f_sizes[7]; - if (size == -1) - size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize(); - - f_sizes[0] = int(size * 0.6); - f_sizes[1] = int(size * 0.8); - f_sizes[2] = size; - f_sizes[3] = int(size * 1.2); - f_sizes[4] = int(size * 1.4); - f_sizes[5] = int(size * 1.6); - f_sizes[6] = int(size * 1.8); - - SetFonts(wxEmptyString, wxEmptyString, f_sizes); + m_fontMode = FontMode_Standard; + m_FontFaceNormal = normal_face; + m_FontFaceFixed = fixed_face; + m_FontsSizesArr[0] = size; } @@ -693,7 +742,15 @@ 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); @@ -717,7 +774,7 @@ class wxHtmlPrintingModule: public wxModule DECLARE_DYNAMIC_CLASS(wxHtmlPrintingModule) public: wxHtmlPrintingModule() : wxModule() {} - bool OnInit() { return TRUE; } + bool OnInit() { return true; } void OnExit() { wxHtmlPrintout::CleanUpStatics(); } };