avoid multiple reallocations in wxString::PrintfV() if vsnprintf() returns the total...

[wxWidgets.git] / src / html / htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 62ff13af35a256346ec6098082708f8b9224259b..b6a1bc636dc3123e08a8ce6ea9976c7736961e18 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation "htmprint.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -36,6 +31,8 @@
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"

+#include "wx/module.h"
+#include "wx/settings.h"

 
 
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------


@@ -92,32 +89,49 @@ 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);
                                 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);

 }
 
 
 }
 
 

-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 maxHeight,
+                             int *known_pagebreaks, int number_of_pages)

 {
     int pbreak, hght;
 
     if (m_Cells == NULL || m_DC == NULL) return 0;
 
     pbreak = (int)(from + m_Height);
 {
     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;
     hght = pbreak - from;

+    if (maxHeight < hght)
+        hght = maxHeight;

 
     if (!dont_render)
     {
 
     if (!dont_render)
     {

+        wxHtmlRenderingInfo rinfo;
+        wxDefaultHtmlRenderingStyle rstyle;
+        rinfo.SetStyle(&rstyle);

         m_DC->SetBrush(*wxWHITE_BRUSH);
         m_DC->SetBrush(*wxWHITE_BRUSH);

-

         m_DC->SetClippingRegion(x, y, m_Width, hght);
         m_Cells->Draw(*m_DC,
         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();
     }
 
         m_DC->DestroyClippingRegion();
     }
 


@@ -134,32 +148,19 @@ int wxHtmlDCRenderer::GetTotalHeight()
 }
 
 
 }
 
 

-
-
-
-
-
-
-
-
-
-
-
-
-
-

 //--------------------------------------------------------------------------------
 // wxHtmlPrintout
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 // wxHtmlPrintout
 //--------------------------------------------------------------------------------
 
 

+wxList wxHtmlPrintout::m_Filters;

 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
     m_Renderer = new wxHtmlDCRenderer;
     m_RendererHdr = new wxHtmlDCRenderer;
     m_NumPages = wxHTML_PRINT_MAX_PAGES;
 
 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;
     m_Headers[0] = m_Headers[1] = wxEmptyString;
     m_Footers[0] = m_Footers[1] = wxEmptyString;
     m_HeaderHeight = m_FooterHeight = 0;


@@ -174,15 +175,22 @@ wxHtmlPrintout::~wxHtmlPrintout()
     delete m_RendererHdr;
 }
 
     delete m_RendererHdr;
 }
 

+void wxHtmlPrintout::CleanUpStatics()
+{
+    WX_CLEAR_LIST(wxList, m_Filters);
+}

 
 

+// Adds input filter
+void wxHtmlPrintout::AddFilter(wxHtmlFilter *filter)
+{
+    m_Filters.Append(filter);
+}

 
 

-bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
+void wxHtmlPrintout::OnPreparePrinting()

 {
     int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
     float ppmm_h, ppmm_v;
 
 {
     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);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
     ppmm_h = (float)pageWidth / mm_w;


@@ -234,7 +242,13 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
                           ));
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
     CountPages();
                           ));
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
     CountPages();

-    return TRUE;
+}
+
+bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
+{
+    if (!wxPrintout::OnBeginDocument(startPage, endPage)) return false;
+
+    return true;

 }
 
 
 }
 
 


@@ -245,18 +259,18 @@ bool wxHtmlPrintout::OnPrintPage(int page)
     {
         if (HasPage(page))
             RenderPage(dc, page);
     {
         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;
 }
 
 
 void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 {
     *minPage = 1;

-    *maxPage = wxHTML_PRINT_MAX_PAGES;
+    *maxPage = m_NumPages;

     *selPageFrom = 1;
     *selPageFrom = 1;

-    *selPageTo = wxHTML_PRINT_MAX_PAGES;
+    *selPageTo = m_NumPages;

 }
 
 
 }
 
 


@@ -278,7 +292,12 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath,
 void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
 {
     wxFileSystem fs;
 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)
     {
 
     if (ff == NULL)
     {


@@ -286,10 +305,27 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
         return;
     }
 
         return;
     }
 

-    wxHtmlFilterHTML filter;
-    wxString doc = filter.ReadFile(*ff);
-    
-    SetHtmlText(doc, htmlfile, FALSE);
+    bool done = false;
+    wxHtmlFilterHTML defaultFilter;
+    wxString doc;
+
+    wxList::compatibility_iterator 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;
 }
 
     delete ff;
 }
 


@@ -335,7 +371,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 = 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());
 }
         m_PageBreaks[++m_NumPages] = pos;
     } while (pos < m_Renderer->GetTotalHeight());
 }


@@ -358,8 +394,10 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);

+    wxUnusedVar(ppiPrinterX);

     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     int ppiScreenX, ppiScreenY;
     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_w / (double)pageWidth);
 


@@ -369,7 +407,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_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)
 
     m_RendererHdr->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
     if (m_Headers[page % 2] != wxEmptyString)


@@ -414,13 +452,21 @@ 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);
 }
 
                               const int *sizes)
 {
     m_Renderer->SetFonts(normal_face, fixed_face, sizes);
     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);
+}
+

 
 
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------


@@ -428,15 +474,15 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face,
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
 
 

-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_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 = 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));
 
     m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25));
     m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25));
 


@@ -452,6 +498,13 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
 }
 
 
 }
 
 

+wxPrintData *wxHtmlEasyPrinting::GetPrintData()
+{
+    if (m_PrintData == NULL)
+        m_PrintData = new wxPrintData();
+    return m_PrintData;
+}
+

 
 bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 {
 
 bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 {


@@ -467,9 +520,9 @@ bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 bool wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath)
 {
     wxHtmlPrintout *p1 = CreatePrintout();
 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();
     wxHtmlPrintout *p2 = CreatePrintout();

-    p2->SetHtmlText(htmltext, basepath, TRUE);
+    p2->SetHtmlText(htmltext, basepath, true);

     return DoPreview(p1, p2);
 }
 
     return DoPreview(p1, p2);
 }
 


@@ -489,7 +542,7 @@ bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile)
 bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath)
 {
     wxHtmlPrintout *p = CreatePrintout();
 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;
     bool ret = DoPrint(p);
     delete p;
     return ret;


@@ -500,68 +553,56 @@ 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.
 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;
     wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
     if (!preview->Ok())
     {
         delete preview;

-        return FALSE;
+        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);
     frame->Initialize();
                                                m_Name + _(" Preview"),
                                                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)
 {
 }
 
 
 
 bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 {

-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());

     wxPrinter printer(&printDialogData);
 
     wxPrinter printer(&printDialogData);
 

-    if (!printer.Print(m_Frame, 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);
-    wxPrintDialog printerDialog(m_Frame, &printDialogData);
-
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-
-    if (printerDialog.ShowModal() == wxID_OK)
-        (*m_PrintData) = printerDialog.GetPrintDialogData().GetPrintData();
-}
-
-

 
 void wxHtmlEasyPrinting::PageSetup()
 {
 
 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;
     }
 
     {
         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);
+    m_PageSetupData->SetPrintData(*GetPrintData());
+    wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);

 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {
 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {

-        (*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData();
+        (*GetPrintData()) = pageSetupDialog.GetPageSetupData().GetPrintData();

         (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
     }
 }
         (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
     }
 }


@@ -587,9 +628,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)
 {
                                   const int *sizes)
 {

+    m_fontMode = FontMode_Explicit;

     m_FontFaceNormal = normal_face;
     m_FontFaceFixed = fixed_face;
 
     m_FontFaceNormal = normal_face;
     m_FontFaceFixed = fixed_face;
 


@@ -602,12 +644,30 @@ void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face,
         m_FontsSizes = NULL;
 }
 
         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);
 
 
 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);
 
     p->SetHeader(m_Headers[0], wxPAGE_EVEN);
     p->SetHeader(m_Headers[1], wxPAGE_ODD);


@@ -622,6 +682,21 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
     return p;
 }
 
     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)
 
 // This hack forces the linker to always link in m_* files
 // (wxHTML doesn't work without handlers from these files)