invalidate best size cache when GTK style changes

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 1206f2f87054bf559bd9b64b6e557552a48dbc26..800ca10d6632b7014a5e681228c0641786335c4a 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "htmprint.h"
 #endif
 
@@ -37,6 +37,7 @@
 #include "wx/wxhtml.h"
 #include "wx/wfstream.h"
 #include "wx/module.h"
+#include "wx/settings.h"
 
 
 //--------------------------------------------------------------------------------
@@ -101,6 +102,24 @@ void wxHtmlDCRenderer::SetFonts(wxString normal_face, wxString fixed_face,
 }
 
 
+void wxHtmlDCRenderer::NormalizeFontSizes(int size)
+{
+    int f_sizes[7];
+    if (size == -1)
+        size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize();
+
+    f_sizes[0] = int(size * 0.6);
+    f_sizes[1] = int(size * 0.8);
+    f_sizes[2] = size;
+    f_sizes[3] = int(size * 1.2);
+    f_sizes[4] = int(size * 1.4);
+    f_sizes[5] = int(size * 1.6);
+    f_sizes[6] = int(size * 1.8);
+    
+    SetFonts(wxEmptyString, wxEmptyString, f_sizes);
+}
+
+
 int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, int *known_pagebreaks, int number_of_pages)
 {
     int pbreak, hght;
@@ -381,8 +400,10 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
 
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+    wxUnusedVar(ppiPrinterX);
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
+    wxUnusedVar(ppiScreenX);
 
     dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
 
@@ -445,6 +466,24 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face,
 }
 
 
+void wxHtmlPrintout::NormalizeFontSizes(int size)
+{
+    int f_sizes[7];
+    if (size == -1)
+        size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize();
+
+    f_sizes[0] = int(size * 0.6);
+    f_sizes[1] = int(size * 0.8);
+    f_sizes[2] = size;
+    f_sizes[3] = int(size * 1.2);
+    f_sizes[4] = int(size * 1.4);
+    f_sizes[5] = int(size * 1.6);
+    f_sizes[6] = int(size * 1.8);
+    
+    SetFonts(wxEmptyString, wxEmptyString, f_sizes);
+}
+
+
 
 //----------------------------------------------------------------------------
 // wxHtmlEasyPrinting
@@ -455,7 +494,7 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
 {
     m_ParentWindow = parentWindow;
     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;
 
@@ -475,6 +514,13 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
 }
 
 
+wxPrintData *wxHtmlEasyPrinting::GetPrintData()
+{
+    if (m_PrintData == NULL)
+        m_PrintData = new wxPrintData();
+    return m_PrintData;
+}
+
 
 bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
 {
@@ -523,7 +569,7 @@ 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.
-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());
     wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
     if (!preview->Ok())
     {
@@ -544,7 +590,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
 
 bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 {
-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());
     wxPrinter printer(&printDialogData);
 
     if (!printer.Print(m_ParentWindow, printout, TRUE))
@@ -552,7 +598,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
         return FALSE;
     }
 
-    (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
+    (*GetPrintData()) = printer.GetPrintDialogData().GetPrintData();
     return TRUE;
 }
 
@@ -560,31 +606,31 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 
 void wxHtmlEasyPrinting::PrinterSetup()
 {
-    wxPrintDialogData printDialogData(*m_PrintData);
+    wxPrintDialogData printDialogData(*GetPrintData());
     wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
 
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
 
     if (printerDialog.ShowModal() == wxID_OK)
-        (*m_PrintData) = printerDialog.GetPrintDialogData().GetPrintData();
+        (*GetPrintData()) = printerDialog.GetPrintDialogData().GetPrintData();
 }
 
 
 
 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;
     }
 
-    m_PageSetupData->SetPrintData(*m_PrintData);
+    m_PageSetupData->SetPrintData(*GetPrintData());
     wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {
-        (*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData();
+        (*GetPrintData()) = pageSetupDialog.GetPageSetupData().GetPrintData();
         (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
     }
 }
@@ -625,6 +671,23 @@ void wxHtmlEasyPrinting::SetFonts(wxString normal_face, wxString fixed_face,
         m_FontsSizes = NULL;
 }
 
+void wxHtmlEasyPrinting::NormalizeFontSizes(int size)
+{
+    int f_sizes[7];
+    if (size == -1)
+        size = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).GetPointSize();
+
+    f_sizes[0] = int(size * 0.6);
+    f_sizes[1] = int(size * 0.8);
+    f_sizes[2] = size;
+    f_sizes[3] = int(size * 1.2);
+    f_sizes[4] = int(size * 1.4);
+    f_sizes[5] = int(size * 1.6);
+    f_sizes[6] = int(size * 1.8);
+    
+    SetFonts(wxEmptyString, wxEmptyString, f_sizes);
+}
+
 
 wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
 {