diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 411d7a03b6..036aa8912f 100644
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -266,17 +266,15 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnPrintSmall(wxCommandEvent& WXUNUSED(event))
{
- int fontsizes[] = { 4, 6, 8, 10, 12, 20, 24 };
- m_Prn->SetFonts(wxEmptyString, wxEmptyString, fontsizes);
+ m_Prn->SetStandardFonts(8);
}
void MyFrame::OnPrintNormal(wxCommandEvent& WXUNUSED(event))
{
- m_Prn->SetFonts(wxEmptyString, wxEmptyString, 0);
+ m_Prn->SetStandardFonts(12);
}
void MyFrame::OnPrintHuge(wxCommandEvent& WXUNUSED(event))
{
- int fontsizes[] = { 20, 26, 28, 30, 32, 40, 44 };
- m_Prn->SetFonts(wxEmptyString, wxEmptyString, fontsizes);
+ m_Prn->SetStandardFonts(28);
}
diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 0d0d2a102a..e4dbbcfda7 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -33,6 +33,10 @@
#include "wx/wfstream.h"
+// default font size of normal text (HTML font size 0) for printing, in points:
+#define DEFAULT_PRINT_FONT_SIZE 12
+
+
//--------------------------------------------------------------------------------
// wxHtmlDCRenderer
//--------------------------------------------------------------------------------
@@ -46,6 +50,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
m_Parser = new wxHtmlWinParser();
m_FS = new wxFileSystem();
m_Parser->SetFS(m_FS);
+ SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
}
@@ -161,6 +166,7 @@ wxHtmlPrintout::wxHtmlPrintout(const wxString& title) : wxPrintout(title)
m_Footers[0] = m_Footers[1] = wxEmptyString;
m_HeaderHeight = m_FooterHeight = 0;
SetMargins(); // to default values
+ SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
}
@@ -500,7 +506,7 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25));
m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25));
- SetFonts(wxEmptyString, wxEmptyString, NULL);
+ SetStandardFonts(DEFAULT_PRINT_FONT_SIZE);
}