Correct a print format specifier mismatch in wxFileConfig::Parse().

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 9b25e01dc6a67edc3915c375e48b8dc220b49f8f..4ce2e3b80a5416175b709ac3c17eea0c62bdc1dc 100644 (file)
--- 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
 // Purpose:     html printing classes
 // Author:      Vaclav Slavik
 // Created:     25/09/99


@@ -8,34 +8,58 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation
-#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"
 

-#include "wx/defs.h"
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dc.h"
 #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"
+    #include "wx/sizer.h"

 #endif
 
 #endif
 

-#if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
-

 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"

-
+#include "wx/infobar.h"
+
+
+// default font size of normal text (HTML font size 0) for printing, in points:
+#define DEFAULT_PRINT_FONT_SIZE   12
+
+
+// CSS specification offer following guidance on dealing with pixel sizes
+// when printing at
+// http://www.w3.org/TR/2004/CR-CSS21-20040225/syndata.html#length-units:
+//
+//      Pixel units are relative to the resolution of the viewing device, i.e.,
+//      most often a computer display. If the pixel density of the output
+//      device is very different from that of a typical computer display, the
+//      user agent should rescale pixel values. It is recommended that the [
+//      reference pixel] be the visual angle of one pixel on a device with a
+//      pixel density of 96dpi and a distance from the reader of an arm's
+//      length. For a nominal arm's length of 28 inches, the visual angle is
+//      therefore about 0.0213 degrees.
+//
+//      For reading at arm's length, 1px thus corresponds to about 0.26 mm
+//      (1/96 inch). When printed on a laser printer, meant for reading at a
+//      little less than arm's length (55 cm, 21 inches), 1px is about 0.20 mm.
+//      On a 300 dots-per-inch (dpi) printer, that may be rounded up to 3 dots
+//      (0.25 mm); on a 600 dpi printer, it can be rounded to 5 dots.
+//
+// See also http://trac.wxwidgets.org/ticket/10942.
+#define TYPICAL_SCREEN_DPI  96.0

 
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer
 
 //--------------------------------------------------------------------------------
 // wxHtmlDCRenderer


@@ -47,9 +71,10 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
     m_DC = NULL;
     m_Width = m_Height = 0;
     m_Cells = NULL;
     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);
     m_FS = new wxFileSystem();
     m_Parser->SetFS(m_FS);

+    SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);

 }
 
 
 }
 
 


@@ -63,27 +88,30 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
 
 
 
 
 
 

-void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale)
+void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale, double font_scale)

 {
     m_DC = dc;
 {
     m_DC = dc;

-    m_Parser->SetDC(m_DC, pixel_scale);
+    m_Parser->SetDC(m_DC, pixel_scale, font_scale);

 }
 
 
 
 void wxHtmlDCRenderer::SetSize(int width, int height)
 {
 }
 
 
 
 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;
 }
 
 
     m_Width = width;
     m_Height = height;
 }
 
 

-

 void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepath, bool isdir)
 {
 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);
 
     m_FS->ChangePathTo(basepath, isdir);
     m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html);


@@ -92,25 +120,53 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
 }
 
 
 }
 
 

+void wxHtmlDCRenderer::SetFonts(const wxString& normal_face, const wxString& fixed_face,
+                                const int *sizes)
+{
+    m_Parser->SetFonts(normal_face, fixed_face, sizes);

 
 

-int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render)
+    if ( m_Cells )
+        m_Cells->Layout(m_Width);
+    // else: SetHtmlText() not yet called, no need for relayout
+}
+
+void wxHtmlDCRenderer::SetStandardFonts(int size,
+                                        const wxString& normal_face,
+                                        const wxString& fixed_face)

 {
 {

-    int pbreak, hght;
+    m_Parser->SetStandardFonts(size, normal_face, fixed_face);

 
 

-    if (m_Cells == NULL || m_DC == NULL) return 0;
+    if ( m_Cells )
+        m_Cells->Layout(m_Width);
+    // else: SetHtmlText() not yet called, no need for relayout
+}
+
+int wxHtmlDCRenderer::Render(int x, int y,
+                             wxArrayInt& known_pagebreaks,
+                             int from, int dont_render, int to)
+{
+    wxCHECK_MSG( m_Cells, 0, "SetHtmlText() must be called before Render()" );
+    wxCHECK_MSG( m_DC, 0, "SetDC() must be called before Render()" );
+
+    int pbreak, hght;

 
     pbreak = (int)(from + m_Height);
 
     pbreak = (int)(from + m_Height);

-    while (m_Cells->AdjustPagebreak(&pbreak)) {}
+    while (m_Cells->AdjustPagebreak(&pbreak, known_pagebreaks)) {}

     hght = pbreak - from;
     hght = pbreak - from;

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

 
     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, y + hght,
+                      rinfo);

         m_DC->DestroyClippingRegion();
     }
 
         m_DC->DestroyClippingRegion();
     }
 


@@ -118,27 +174,15 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render)
     else return GetTotalHeight();
 }
 
     else return GetTotalHeight();
 }
 

-
-
-int wxHtmlDCRenderer::GetTotalHeight()
+int wxHtmlDCRenderer::GetTotalWidth() const

 {
 {

-    if (m_Cells) return m_Cells->GetHeight();
-    else return 0;
+    return m_Cells ? m_Cells->GetWidth() : 0;

 }
 
 }
 

-
-
-
-
-
-
-
-
-
-
-
-
-
+int wxHtmlDCRenderer::GetTotalHeight() const
+{
+    return m_Cells ? m_Cells->GetHeight() : 0;
+}

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


@@ -146,17 +190,19 @@ int wxHtmlDCRenderer::GetTotalHeight()
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

+wxList wxHtmlPrintout::m_Filters;

 
 wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
 {
     m_Renderer = new wxHtmlDCRenderer;
     m_RendererHdr = new wxHtmlDCRenderer;
 
 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_NumPages = INT_MAX;
+    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
     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);

 }
 
 
 }
 
 


@@ -167,14 +213,89 @@ 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)
+bool
+wxHtmlPrintout::CheckFit(const wxSize& pageArea, const wxSize& docArea) const

 {
 {

-    int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
-    float ppmm_h, ppmm_v;
+    // Nothing to do if the contents fits horizontally.
+    if ( docArea.x <= pageArea.x )
+        return true;
+
+    // Otherwise warn the user more or less intrusively depending on whether
+    // we're previewing or printing:
+    if ( wxPrintPreview * const preview = GetPreview() )
+    {
+        // Don't annoy the user too much when previewing by using info bar
+        // instead of a dialog box.
+#if wxUSE_INFOBAR
+        wxFrame * const parent = preview->GetFrame();
+        wxCHECK_MSG( parent, false, "No parent preview frame?" );
+
+        wxSizer * const sizer = parent->GetSizer();
+        wxCHECK_MSG( sizer, false, "Preview frame should be using sizers" );
+
+        wxInfoBar * const bar = new wxInfoBar(parent);
+        sizer->Add(bar, wxSizerFlags().Expand());
+
+        // Note that the message here is similar to the one below but not
+        // exactly the same, notably we don't use the document title here
+        // because it's already clear which document it pertains to and the
+        // title may be long enough to make the text not fit in the window.
+        bar->ShowMessage
+             (
+              _("This document doesn't fit on the page horizontally and "
+                "will be truncated when it is printed."),
+              wxICON_WARNING
+             );
+#endif // wxUSE_INFOBAR
+    }
+    else // We're going to really print and not just preview.
+    {
+        // This is our last chance to warn the user that the output will be
+        // mangled so do show a message box.
+        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;
+}

 
 

-    if (!wxPrintout::OnBeginDocument(startPage, endPage)) return FALSE;
+void wxHtmlPrintout::OnPreparePrinting()
+{
+    int pageWidth, pageHeight, mm_w, mm_h, dc_w, dc_h;
+    float ppmm_h, ppmm_v;

 
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);
 
     GetPageSizePixels(&pageWidth, &pageHeight);
     GetPageSizeMM(&mm_w, &mm_h);


@@ -183,17 +304,21 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
 
     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);

 
 

-    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_h / (double)pageHeight);

 
     /* prepare headers/footers renderer: */
 
 
     /* prepare headers/footers renderer: */
 

-    m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
+    m_RendererHdr->SetDC(GetDC(),
+                         (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                         (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->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginRight)),
                           (int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
     if (m_Headers[0] != wxEmptyString)


@@ -218,45 +343,69 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
     }
 
     /* prepare main renderer: */
     }
 
     /* 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)
-                          ));
+    m_Renderer->SetDC(GetDC(),
+                      (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                      (double)ppiPrinterY / (double)ppiScreenY);
+
+    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);
     m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);

-    CountPages();
-    return TRUE;
+
+    if ( CheckFit(wxSize(printAreaW, printAreaH),
+                  wxSize(m_Renderer->GetTotalWidth(),
+                         m_Renderer->GetTotalHeight())) || IsPreview() )
+    {
+        // 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;
+
+    return true;

 }
 
 
 bool wxHtmlPrintout::OnPrintPage(int page)
 {
     wxDC *dc = GetDC();
 }
 
 
 bool wxHtmlPrintout::OnPrintPage(int page)
 {
     wxDC *dc = GetDC();

-    if (dc)
+    if (dc && dc->IsOk())

     {
         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;
+    if ( m_NumPages >= (signed)m_PageBreaks.GetCount()-1)
+        *maxPage = m_NumPages;
+    else
+        *maxPage = (signed)m_PageBreaks.GetCount()-1;

     *selPageFrom = 1;
     *selPageFrom = 1;

-    *selPageTo = wxHTML_PRINT_MAX_PAGES;
+    *selPageTo = (signed)m_PageBreaks.GetCount()-1;

 }
 
 
 
 bool wxHtmlPrintout::HasPage(int pageNum)
 {
 }
 
 
 
 bool wxHtmlPrintout::HasPage(int pageNum)
 {

-    return (pageNum >= 1 && pageNum <= m_NumPages);
+    return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount();

 }
 
 
 }
 
 


@@ -268,12 +417,15 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath,
     m_BasePathIsDir = isdir;
 }
 
     m_BasePathIsDir = isdir;
 }
 

-
-

 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)
     {


@@ -281,16 +433,28 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
         return;
     }
 
         return;
     }
 

-    wxInputStream *st = ff->GetStream();
-    char *t = new char[st->GetSize() + 1];
-    st->Read(t, st->GetSize());
-    t[st->GetSize()] = 0;
+    bool done = false;
+    wxHtmlFilterHTML defaultFilter;
+    wxString doc;

 
 

-    wxString doc = wxString(t);
-    delete t;
-    delete ff;
+    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();
+    }

 
 

-    SetHtmlText(doc, htmlfile, FALSE);
+    if (!done)
+        doc = defaultFilter.ReadFile(*ff);
+
+    SetHtmlText(doc, htmlfile, false);
+    delete ff;

 }
 
 
 }
 
 


@@ -327,16 +491,17 @@ void wxHtmlPrintout::CountPages()
     ppmm_v = (float)pageHeight / mm_h;
 
     int pos = 0;
     ppmm_v = (float)pageHeight / mm_h;
 
     int pos = 0;

-

     m_NumPages = 0;
 
     m_NumPages = 0;
 

-    m_PageBreaks[0] = 0;
+    m_PageBreaks.Clear();
+    m_PageBreaks.Add( 0);

     do
     {
         pos = m_Renderer->Render((int)( ppmm_h * m_MarginLeft),
     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;
+                                 (int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
+                                 m_PageBreaks,
+                                 pos, true, INT_MAX);
+        m_PageBreaks.Add( pos);

     } while (pos < m_Renderer->GetTotalHeight());
 }
 
     } while (pos < m_Renderer->GetTotalHeight());
 }
 


@@ -346,41 +511,48 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
 {
     wxBusyCursor wait;
 
 {
     wxBusyCursor wait;
 

-    int pageWidth, pageHeight, mm_w, mm_h, scr_w, scr_h, dc_w, dc_h;
+    int pageWidth, pageHeight, mm_w, mm_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;
     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;

-    wxDisplaySize(&scr_w, &scr_h);

     dc->GetSize(&dc_w, &dc_h);
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
     dc->GetSize(&dc_w, &dc_h);
 
     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_h / (double)pageHeight);

 
 

-    m_Renderer->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
+    m_Renderer->SetDC(dc,
+                      (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                      (double)ppiPrinterY / (double)ppiScreenY);

 
 

-    dc->SetBackgroundMode(wxTRANSPARENT);
+    dc->SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);

 
     m_Renderer->Render((int) (ppmm_h * m_MarginLeft),
 
     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]);
+                         (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);
+    m_RendererHdr->SetDC(dc,
+                         (double)ppiPrinterY / TYPICAL_SCREEN_DPI,
+                         (double)ppiPrinterY / (double)ppiScreenY);

     if (m_Headers[page % 2] != wxEmptyString)
     {
         m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
     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));
     }
     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);

     }
 }
 
     }
 }
 


@@ -394,9 +566,15 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page)
     num.Printf(wxT("%i"), page);
     r.Replace(wxT("@PAGENUM@"), num);
 
     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);
 
     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;
 }
 
     return r;
 }
 


@@ -414,27 +592,41 @@ void wxHtmlPrintout::SetMargins(float top, float bottom, float left, float right
 
 
 
 
 
 

+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::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);
+}

 
 

-//--------------------------------------------------------------------------------
+
+
+//----------------------------------------------------------------------------

 // wxHtmlEasyPrinting
 // 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_Name = name;

-    m_PrintData = new wxPrintData;
-#if (defined __WXGTK__) || (defined __WXMOTIF__)
-    (*m_PrintData) = (*wxThePrintSetupData);
-#endif
+    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));

+
+    SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);

 }
 
 
 }
 
 


@@ -446,6 +638,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)
 {


@@ -461,9 +660,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);
 }
 


@@ -483,7 +682,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;


@@ -494,62 +693,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()
 {

-    m_PageSetupData->SetPrintData(*m_PrintData);
-    wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
+    if (!GetPrintData()->Ok())
+    {
+        wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
+        return;
+    }
+
+    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();
     }
 }


@@ -575,11 +768,47 @@ void wxHtmlEasyPrinting::SetFooter(const wxString& footer, int pg)
 }
 
 
 }
 
 

+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;
+
+    if (sizes)
+    {
+        m_FontsSizes = m_FontsSizesArr;
+        for (int i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
+    }
+    else
+        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);
 

+    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->SetFooter(m_Footers[0], wxPAGE_EVEN);
     p->SetHeader(m_Headers[0], wxPAGE_EVEN);
     p->SetHeader(m_Headers[1], wxPAGE_ODD);
     p->SetFooter(m_Footers[0], wxPAGE_EVEN);


@@ -593,6 +822,25 @@ 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)
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()

 
 #endif // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
 
 #endif // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE