fixed array tests compilation and a bug in obj array test

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

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index b3eee134e879b03ea4af2c50ae7de656bc4dab49..5fe427ea148f26fa6784c445b0d1b4d3b53939c1 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -269,7 +269,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)
 {
@@ -283,12 +284,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);
@@ -595,5 +593,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