// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
DrawingDocument::~DrawingDocument(void)
{
- doodleSegments.DeleteContents(TRUE);
+ WX_CLEAR_LIST(wxList, doodleSegments);
}
#if wxUSE_STD_IOSTREAM
-ostream& DrawingDocument::SaveObject(ostream& stream)
+wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
{
wxDocument::SaveObject(stream);
- wxInt32 n = doodleSegments.Number();
- stream << n << '\n';
+ wxInt32 n = doodleSegments.GetCount();
+ stream << n << _T('\n');
- wxNode *node = doodleSegments.First();
+ wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
- DoodleSegment *segment = (DoodleSegment *)node->Data();
+ DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
- stream << '\n';
+ stream << _T('\n');
- node = node->Next();
+ node = node->GetNext();
}
return stream;
wxTextOutputStream text_stream( stream );
- wxInt32 n = doodleSegments.Number();
- text_stream << n << '\n';
+ wxInt32 n = doodleSegments.GetCount();
+ text_stream << n << _T('\n');
- wxNode *node = doodleSegments.First();
+ wxList::compatibility_iterator node = doodleSegments.GetFirst();
while (node)
{
- DoodleSegment *segment = (DoodleSegment *)node->Data();
+ DoodleSegment *segment = (DoodleSegment *)node->GetData();
segment->SaveObject(stream);
- text_stream << '\n';
+ text_stream << _T('\n');
- node = node->Next();
+ node = node->GetNext();
}
return stream;
#endif
#if wxUSE_STD_IOSTREAM
-istream& DrawingDocument::LoadObject(istream& stream)
+wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
{
wxDocument::LoadObject(stream);
DoodleSegment::DoodleSegment(DoodleSegment& seg)
{
- wxNode *node = seg.lines.First();
+ wxList::compatibility_iterator node = seg.lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
+ DoodleLine *line = (DoodleLine *)node->GetData();
DoodleLine *newLine = new DoodleLine;
newLine->x1 = line->x1;
newLine->y1 = line->y1;
lines.Append(newLine);
- node = node->Next();
+ node = node->GetNext();
}
}
DoodleSegment::~DoodleSegment(void)
{
- lines.DeleteContents(TRUE);
+ WX_CLEAR_LIST(wxList, lines);
}
#if wxUSE_STD_IOSTREAM
-ostream& DoodleSegment::SaveObject(ostream& stream)
+wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
{
- wxInt32 n = lines.Number();
- stream << n << '\n';
+ wxInt32 n = lines.GetCount();
+ stream << n << _T('\n');
- wxNode *node = lines.First();
+ wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
- stream << line->x1 << " " <<
- line->y1 << " " <<
- line->x2 << " " <<
- line->y2 << "\n";
- node = node->Next();
+ DoodleLine *line = (DoodleLine *)node->GetData();
+ stream << line->x1 << _T(" ") <<
+ line->y1 << _T(" ") <<
+ line->x2 << _T(" ") <<
+ line->y2 << _T("\n");
+ node = node->GetNext();
}
return stream;
{
wxTextOutputStream text_stream( stream );
- wxInt32 n = lines.Number();
- text_stream << n << '\n';
+ wxInt32 n = lines.GetCount();
+ text_stream << n << _T('\n');
- wxNode *node = lines.First();
+ wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
- text_stream << line->x1 << " " <<
- line->y1 << " " <<
- line->x2 << " " <<
- line->y2 << "\n";
- node = node->Next();
+ DoodleLine *line = (DoodleLine *)node->GetData();
+ text_stream << line->x1 << _T(" ") <<
+ line->y1 << _T(" ") <<
+ line->x2 << _T(" ") <<
+ line->y2 << _T("\n");
+ node = node->GetNext();
}
return stream;
#endif
#if wxUSE_STD_IOSTREAM
-istream& DoodleSegment::LoadObject(istream& stream)
+wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
{
wxInt32 n = 0;
stream >> n;
DoodleLine *line = new DoodleLine;
stream >> line->x1 >>
line->y1 >>
- line->x2 >>
- line->y2;
+ line->x2 >>
+ line->y2;
lines.Append(line);
}
DoodleLine *line = new DoodleLine;
text_stream >> line->x1 >>
line->y1 >>
- line->x2 >>
- line->y2;
+ line->x2 >>
+ line->y2;
lines.Append(line);
}
#endif
void DoodleSegment::Draw(wxDC *dc)
{
- wxNode *node = lines.First();
+ wxList::compatibility_iterator node = lines.GetFirst();
while (node)
{
- DoodleLine *line = (DoodleLine *)node->Data();
+ DoodleLine *line = (DoodleLine *)node->GetData();
dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
- node = node->Next();
+ node = node->GetNext();
}
}
case DOODLE_CUT:
{
// Cut the last segment
- if (doc->GetDoodleSegments().Number() > 0)
+ if (doc->GetDoodleSegments().GetCount() > 0)
{
- wxNode *node = doc->GetDoodleSegments().Last();
+ wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
if (segment)
delete segment;
- segment = (DoodleSegment *)node->Data();
- delete node;
+ segment = (DoodleSegment *)node->GetData();
+ doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE);
doc->UpdateAllViews();
case DOODLE_ADD:
{
// Cut the last segment
- if (doc->GetDoodleSegments().Number() > 0)
+ if (doc->GetDoodleSegments().GetCount() > 0)
{
- wxNode *node = doc->GetDoodleSegments().Last();
- DoodleSegment *seg = (DoodleSegment *)node->Data();
+ wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
+ DoodleSegment *seg = (DoodleSegment *)node->GetData();
delete seg;
- delete node;
+ doc->GetDoodleSegments().Erase(node);
doc->Modify(TRUE);
doc->UpdateAllViews();