Start() should resume the stopwatch if it is suspended

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 3dd7639e7b7380dac3df8e8708016d23b6d5b158..a2dfa82097ab880c1735d8500d2e628584a1c0da 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -10,7 +10,7 @@
 
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma implementation "htmprint.h"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -269,8 +269,6 @@ void wxHtmlPrintout::SetHtmlText(const wxString& html, const wxString &basepath,
     m_BasePathIsDir = isdir;
 }
 
-
-
 void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
 {
     wxFileSystem fs;
@@ -282,16 +280,11 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
         return;
     }
 
-    wxInputStream *st = ff->GetStream();
-    char *t = new char[st->GetSize() + 1];
-    st->Read(t, st->GetSize());
-    t[st->GetSize()] = 0;
-
-    wxString doc = wxString(t);
-    delete t;
-    delete ff;
-
+    wxHtmlFilterHTML filter;
+    wxString doc = filter.ReadFile(*ff);
+    
     SetHtmlText(doc, htmlfile, FALSE);
+    delete ff;
 }
 
 
@@ -427,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;
 
@@ -545,6 +535,12 @@ void wxHtmlEasyPrinting::PrinterSetup()
 
 void wxHtmlEasyPrinting::PageSetup()
 {
+    if (!m_PrintData->Ok())
+    {
+        wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
+        return;
+    }
+
     m_PageSetupData->SetPrintData(*m_PrintData);
     wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);