Changed wxHTML default font size for printing to be 12pt regardless

of the platform; this font shouldn't depend on toolkit's default
GUI font (introduced in 2.8, now reverting to pre-2.8 correct
behaviour).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-06-04 22:34:09 +00:00
parent 84e455807e
commit 7258d99573
2 changed files with 10 additions and 6 deletions

View File

@@ -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);
}