diff --git a/docs/changes.txt b/docs/changes.txt index fa710c21e9..2898dc4588 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -87,6 +87,7 @@ Major new features in 2.8 release wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane, wxSearchCtrl, wxAboutBox, wxTreebook, tar streams. + 2.8.9 ----- @@ -97,6 +98,8 @@ All (GUI): - Fixed help viewer bug whereby the splitter sash in wxHtmlHelpWindow could go underneath the left-hand pane, permanently, after resizing the help window. +- Fixed wxHTML default font size for printing to be 12pt regardless of the + platform, instead of depending on GUI toolkit's screen configuration. All (Unix): @@ -114,6 +117,7 @@ wxGTK: wxMac: + 2.8.8 ----- diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index 6ce878f0a5..60a73266a3 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -263,17 +263,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 26aae71024..a1497abeda 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); } @@ -502,7 +508,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); }