From 00a1c49a77f50b13034a54df0285dc09c7e4f243 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 15 Oct 2008 11:22:53 +0000 Subject: [PATCH] compilation fix for wxUSE_STD_IOSTREAM==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/docview/doc.cpp | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp index 1f1715d781..4108800ede 100644 --- a/samples/docview/doc.cpp +++ b/samples/docview/doc.cpp @@ -44,25 +44,37 @@ IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) -DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& stream) +DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& ostream) { - wxDocument::SaveObject(stream); +#if wxUSE_STD_IOSTREAM + DocumentOstream& stream = ostream; +#else + wxTextOutputStream stream(ostream); +#endif + + wxDocument::SaveObject(ostream); const wxInt32 count = m_doodleSegments.size(); stream << count << '\n'; for ( int n = 0; n < count; n++ ) { - m_doodleSegments[n].SaveObject(stream); + m_doodleSegments[n].SaveObject(ostream); stream << '\n'; } - return stream; + return ostream; } -DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& stream) +DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream) { - wxDocument::LoadObject(stream); +#if wxUSE_STD_IOSTREAM + DocumentIstream& stream = istream; +#else + wxTextInputStream stream(istream); +#endif + + wxDocument::LoadObject(istream); wxInt32 count = 0; stream >> count; @@ -70,11 +82,11 @@ DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& stream) for ( int n = 0; n < count; n++ ) { DoodleSegment segment; - segment.LoadObject(stream); + segment.LoadObject(istream); m_doodleSegments.push_back(segment); } - return stream; + return istream; } void DrawingDocument::DoUpdate() @@ -130,7 +142,7 @@ DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream) << line.y2 << '\n'; } - return stream; + return ostream; } DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream) @@ -155,7 +167,7 @@ DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream) m_lines.push_back(line); } - return stream; + return istream; } // ---------------------------------------------------------------------------- -- 2.47.2