added missing wxListItem copy ctor to wxMSW, moved wxListItem to the header

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 4c6c3e688d4efc9f2cfb1de1e6571a663eb9f547..8cd032ff03df3dcfa348b0e7aa4e1981b9a2d9b4 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".
@@ -25,10 +25,13 @@
 #ifndef WX_PRECOMP
     #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
 
+#include "wx/dc.h"
 #include "wx/print.h"
 #include "wx/printdlg.h"
 #include "wx/html/htmprint.h"
@@ -267,7 +270,8 @@ 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)
 {
@@ -281,12 +285,9 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
     }
 
     wxInputStream *st = ff->GetStream();
-    char *t = new char[st->GetSize() + 1];
-    st->Read(t, st->GetSize());
-    t[st->GetSize()] = 0;
+    wxString doc;
+    wxPrivate_ReadString(doc, st);
 
-    wxString doc = wxString(t);
-    delete t;
     delete ff;
 
     SetHtmlText(doc, htmlfile, FALSE);
@@ -543,6 +544,13 @@ void wxHtmlEasyPrinting::PrinterSetup()
 
 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);
+        return;
+    }
+
     m_PageSetupData->SetPrintData(*m_PrintData);
     wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
 
@@ -593,5 +601,9 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
 }
 
 
+// This hack forces the linker to always link in m_* files
+// (wxHTML doesn't work without handlers from these files)
+#include "wx/html/forcelnk.h"
+FORCE_WXHTML_MODULES()
 
 #endif // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE