X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/691d944f7e7646df976c0fbd179a0756c1bb182d..61c213fe224da24ce33c9187263e75a17ca83a04:/samples/docvwmdi/doc.cpp?ds=inline diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp index 4b7ee90dae..1da72d5f13 100644 --- a/samples/docvwmdi/doc.cpp +++ b/samples/docvwmdi/doc.cpp @@ -34,10 +34,6 @@ IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument) -DrawingDocument::DrawingDocument(void) -{ -} - DrawingDocument::~DrawingDocument(void) { WX_CLEAR_LIST(wxList, doodleSegments); @@ -47,20 +43,20 @@ DrawingDocument::~DrawingDocument(void) wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream) { wxDocument::SaveObject(stream); - + wxInt32 n = doodleSegments.GetCount(); stream << n << _T('\n'); - + wxList::compatibility_iterator node = doodleSegments.GetFirst(); while (node) { DoodleSegment *segment = (DoodleSegment *)node->GetData(); segment->SaveObject(stream); stream << _T('\n'); - + node = node->GetNext(); } - + return stream; } #else @@ -72,17 +68,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) wxInt32 n = doodleSegments.GetCount(); text_stream << n << _T('\n'); - + wxList::compatibility_iterator node = doodleSegments.GetFirst(); while (node) { DoodleSegment *segment = (DoodleSegment *)node->GetData(); segment->SaveObject(stream); text_stream << _T('\n'); - + node = node->GetNext(); } - + return stream; } #endif @@ -91,7 +87,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream) wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream) { wxDocument::LoadObject(stream); - + wxInt32 n = 0; stream >> n; @@ -124,11 +120,9 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream) return stream; } #endif -DoodleSegment::DoodleSegment(void) -{ -} DoodleSegment::DoodleSegment(DoodleSegment& seg) + :wxObject() { wxList::compatibility_iterator node = seg.lines.GetFirst(); while (node) @@ -156,14 +150,14 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream) { wxInt32 n = lines.GetCount(); stream << n << _T('\n'); - + wxList::compatibility_iterator node = lines.GetFirst(); while (node) { DoodleLine *line = (DoodleLine *)node->GetData(); - stream << line->x1 << _T(" ") << - line->y1 << _T(" ") << - line->x2 << _T(" ") << + stream << line->x1 << _T(" ") << + line->y1 << _T(" ") << + line->x2 << _T(" ") << line->y2 << _T("\n"); node = node->GetNext(); } @@ -177,14 +171,14 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream) wxInt32 n = lines.GetCount(); text_stream << n << _T('\n'); - + wxList::compatibility_iterator node = lines.GetFirst(); while (node) { DoodleLine *line = (DoodleLine *)node->GetData(); - text_stream << line->x1 << _T(" ") << - line->y1 << _T(" ") << - line->x2 << _T(" ") << + text_stream << line->x1 << _T(" ") << + line->y1 << _T(" ") << + line->x2 << _T(" ") << line->y2 << _T("\n"); node = node->GetNext(); } @@ -202,13 +196,13 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream) for (int i = 0; i < n; i++) { DoodleLine *line = new DoodleLine; - stream >> line->x1 >> - line->y1 >> - line->x2 >> + stream >> line->x1 >> + line->y1 >> + line->x2 >> line->y2; lines.Append(line); } - + return stream; } #else @@ -222,13 +216,13 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream) for (int i = 0; i < n; i++) { DoodleLine *line = new DoodleLine; - text_stream >> line->x1 >> - line->y1 >> - line->x2 >> + text_stream >> line->x1 >> + line->y1 >> + line->x2 >> line->y2; lines.Append(line); } - + return stream; } #endif @@ -273,7 +267,7 @@ bool DrawingCommand::Do(void) wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast(); if (segment) delete segment; - + segment = (DoodleSegment *)node->GetData(); doc->GetDoodleSegments().Erase(node);