X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23a54e14a71e9184c3c33c2ba39b10ee1dd029b6..a81c3c2383f9096ef5e96b708a0f1c1ffe7cc6a8:/samples/docvwmdi/doc.cpp diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp index fe26f59bad..5a327aefe3 100644 --- a/samples/docvwmdi/doc.cpp +++ b/samples/docvwmdi/doc.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -44,7 +44,7 @@ DrawingDocument::~DrawingDocument(void) } #if wxUSE_STD_IOSTREAM -ostream& DrawingDocument::SaveObject(ostream& stream) +wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) { wxDocument::SaveObject(stream); @@ -88,7 +88,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) #endif #if wxUSE_STD_IOSTREAM -istream& DrawingDocument::LoadObject(istream& stream) +wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) { wxDocument::LoadObject(stream); @@ -152,7 +152,7 @@ DoodleSegment::~DoodleSegment(void) } #if wxUSE_STD_IOSTREAM -ostream& DoodleSegment::SaveObject(ostream& stream) +wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream) { wxInt32 n = lines.Number(); stream << n << '\n'; @@ -163,8 +163,8 @@ ostream& DoodleSegment::SaveObject(ostream& stream) DoodleLine *line = (DoodleLine *)node->Data(); stream << line->x1 << " " << line->y1 << " " << - line->x2 << " " << - line->y2 << "\n"; + line->x2 << " " << + line->y2 << "\n"; node = node->Next(); } @@ -184,8 +184,8 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) DoodleLine *line = (DoodleLine *)node->Data(); text_stream << line->x1 << " " << line->y1 << " " << - line->x2 << " " << - line->y2 << "\n"; + line->x2 << " " << + line->y2 << "\n"; node = node->Next(); } @@ -194,7 +194,7 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) #endif #if wxUSE_STD_IOSTREAM -istream& DoodleSegment::LoadObject(istream& stream) +wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream) { wxInt32 n = 0; stream >> n; @@ -204,8 +204,8 @@ istream& DoodleSegment::LoadObject(istream& stream) DoodleLine *line = new DoodleLine; stream >> line->x1 >> line->y1 >> - line->x2 >> - line->y2; + line->x2 >> + line->y2; lines.Append(line); } @@ -224,8 +224,8 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream) DoodleLine *line = new DoodleLine; text_stream >> line->x1 >> line->y1 >> - line->x2 >> - line->y2; + line->x2 >> + line->y2; lines.Append(line); }