X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2034f1b6e04a39f6d882cf6cdd53c11bf39f5d7..536732e4822cc89c41a3b753c2a7f83abf98793d:/src/html/htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 89f5e3c83c..121503447e 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -114,12 +114,15 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render, int to, in
 
     if (!dont_render)
     {
+        wxHtmlRenderingInfo rinfo;
+        wxDefaultHtmlRenderingStyle rstyle;
+        rinfo.SetStyle(&rstyle);
         m_DC->SetBrush(*wxWHITE_BRUSH);
-
         m_DC->SetClippingRegion(x, y, m_Width, hght);
         m_Cells->Draw(*m_DC,
-                        x, (y - from),
-                        y, pbreak + (y /*- from*/));
+                      x, (y - from),
+                      y, pbreak + (y /*- from*/),
+                      rinfo);
         m_DC->DestroyClippingRegion();
     }
 
@@ -430,9 +433,9 @@ void wxHtmlPrintout::SetFonts(wxString normal_face, wxString fixed_face,
 //----------------------------------------------------------------------------
 
 
-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_PrintData = new wxPrintData;
     m_PageSetupData = new wxPageSetupDialogData;
@@ -510,7 +513,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
         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);
@@ -526,7 +529,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
     wxPrintDialogData printDialogData(*m_PrintData);
     wxPrinter printer(&printDialogData);
 
-    if (!printer.Print(m_Frame, printout, TRUE))
+    if (!printer.Print(m_ParentWindow, printout, TRUE))
     {
         return FALSE;
     }
@@ -540,7 +543,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
 void wxHtmlEasyPrinting::PrinterSetup()
 {
     wxPrintDialogData printDialogData(*m_PrintData);
-    wxPrintDialog printerDialog(m_Frame, &printDialogData);
+    wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
 
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
 
@@ -559,7 +562,7 @@ void wxHtmlEasyPrinting::PageSetup()
     }
 
     m_PageSetupData->SetPrintData(*m_PrintData);
-    wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
+    wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
 
     if (pageSetupDialog.ShowModal() == wxID_OK)
     {