X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4af5cca4a3838e4c89a5badd63f8d309fe1ed91f..d6379fa35ae3de7140bd79623fc7ffeb9e6d6be1:/src/html/htmprint.cpp

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 8cd032ff03..a2dfa82097 100644
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -26,7 +26,6 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dc.h"
-    #include "wx/msgdlg.h"
 #endif
 
 #if wxUSE_HTML && wxUSE_PRINTING_ARCHITECTURE && wxUSE_STREAMS
@@ -270,9 +269,6 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath,
     m_BasePathIsDir = isdir;
 }
 
-// defined in htmlfilt.cpp
-void wxPrivate_ReadString(wxString& str, wxInputStream* s);
-
 void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
 {
     wxFileSystem fs;
@@ -284,13 +280,11 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
         return;
     }
 
-    wxInputStream *st = ff->GetStream();
-    wxString doc;
-    wxPrivate_ReadString(doc, st);
-
-    delete ff;
-
+    wxHtmlFilterHTML filter;
+    wxString doc = filter.ReadFile(*ff);
+    
     SetHtmlText(doc, htmlfile, FALSE);
+    delete ff;
 }
 
 
@@ -426,9 +420,6 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxFrame *parent_fra
     m_Frame = parent_frame;
     m_Name = name;
     m_PrintData = new wxPrintData;
-#if (defined __WXGTK__) || (defined __WXMOTIF__)
-    (*m_PrintData) = (*wxThePrintSetupData);
-#endif
     m_PageSetupData = new wxPageSetupDialogData;
     m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
 
@@ -546,8 +537,7 @@ void wxHtmlEasyPrinting::PageSetup()
 {
     if (!m_PrintData->Ok())
     {
-        wxMessageBox(_("Sorry, there was a problem: you may need to set a default printer."),
-            _("Page Setup Problem"), wxICON_INFORMATION|wxOK, m_Frame);
+        wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
         return;
     }