Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the need for wxStream::GetSize in wxHTML.

Browse Source 
Ascape '&' in text/plain.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-04-21 17:36:16 +00:00
parent f90566f5c3
commit eb37e1d2f3
3 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/html/htmprint.cpp
View File

@@ -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);