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

compilation fix for wxUSE_STD_IOSTREAM==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-15 11:22:53 +00:00
parent bb94502f9f
commit 00a1c49a77
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/docview/doc.cpp
View File

@@ -44,25 +44,37 @@
IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) 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(); const wxInt32 count = m_doodleSegments.size();
stream << count << '\n'; stream << count << '\n';
for ( int n = 0; n < count; n++ ) for ( int n = 0; n < count; n++ )
{ {
m_doodleSegments[n].SaveObject(stream); m_doodleSegments[n].SaveObject(ostream);
stream << '\n'; 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; wxInt32 count = 0;
stream >> count; stream >> count;
@@ -70,11 +82,11 @@ DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& stream)
for ( int n = 0; n < count; n++ ) for ( int n = 0; n < count; n++ )
{ {
DoodleSegment segment; DoodleSegment segment;
segment.LoadObject(stream); segment.LoadObject(istream);
m_doodleSegments.push_back(segment); m_doodleSegments.push_back(segment);
} }
return stream; return istream;
} }
void DrawingDocument::DoUpdate() void DrawingDocument::DoUpdate()
@@ -130,7 +142,7 @@ DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream)
<< line.y2 << '\n'; << line.y2 << '\n';
} }
return stream; return ostream;
} }
DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream) DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
@@ -155,7 +167,7 @@ DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
m_lines.push_back(line); m_lines.push_back(line);
} }
return stream; return istream;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------