-1->wxID_ANY, TRUE->true and FALSE->false replacements.

[wxWidgets.git] / samples / docvwmdi / doc.cpp

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index f8a7206fafc6221d1f37d3a5ddbda52db0095d64..19487ad910483824f280d6700d4da59a13ed4b56 100644 (file)
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -5,8 +5,8 @@
 // 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__
@@ -23,9 +23,10 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
+#include "wx/txtstrm.h"
 
-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
 #include "doc.h"
@@ -39,31 +40,59 @@ DrawingDocument::DrawingDocument(void)
 
 DrawingDocument::~DrawingDocument(void)
 {
-  doodleSegments.DeleteContents(TRUE);
+  WX_CLEAR_LIST(wxList, doodleSegments);
 }
 
-ostream& DrawingDocument::SaveObject(ostream& stream)
+#if wxUSE_STD_IOSTREAM
+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
+wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 {
   wxDocument::SaveObject(stream);
 
-  stream << doodleSegments.Number() << '\n';
-  wxNode *node = doodleSegments.First();
+  wxTextOutputStream text_stream( stream );
+
+  wxInt32 n = doodleSegments.GetCount();
+  text_stream << n << _T('\n');
+  
+  wxList::compatibility_iterator node = doodleSegments.GetFirst();
   while (node)
   {
-    DoodleSegment *segment = (DoodleSegment *)node->Data();
+    DoodleSegment *segment = (DoodleSegment *)node->GetData();
     segment->SaveObject(stream);
-    stream << '\n';
+    text_stream << _T('\n');
     
-    node = node->Next();
+    node = node->GetNext();
   }
+  
   return stream;
 }
+#endif
 
-istream& DrawingDocument::LoadObject(istream& stream)
+#if wxUSE_STD_IOSTREAM
+wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
 {
   wxDocument::LoadObject(stream);
-
-  int n = 0;
+  
+  wxInt32 n = 0;
   stream >> n;
 
   for (int i = 0; i < n; i++)
@@ -75,17 +104,36 @@ istream& DrawingDocument::LoadObject(istream& stream)
 
   return stream;
 }
+#else
+wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
+{
+  wxDocument::LoadObject(stream);
+
+  wxTextInputStream text_stream( stream );
+
+  wxInt32 n = 0;
+  text_stream >> n;
+
+  for (int i = 0; i < n; i++)
+  {
+    DoodleSegment *segment = new DoodleSegment;
+    segment->LoadObject(stream);
+    doodleSegments.Append(segment);
+  }
 
+  return stream;
+}
+#endif
 DoodleSegment::DoodleSegment(void)
 {
 }
 
 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;
@@ -94,50 +142,104 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
 
     lines.Append(newLine);
 
-    node = node->Next();
+    node = node->GetNext();
   }
 }
 
 DoodleSegment::~DoodleSegment(void)
 {
-  lines.DeleteContents(TRUE);
+  WX_CLEAR_LIST(wxList, lines);
 }
 
-ostream& DoodleSegment::SaveObject(ostream& stream)
+#if wxUSE_STD_IOSTREAM
+wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
 {
-  stream << lines.Number() << '\n';
-  wxNode *node = lines.First();
+  wxInt32 n = lines.GetCount();
+  stream << n << _T('\n');
+  
+  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;
 }
+#else
+wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
+{
+  wxTextOutputStream text_stream( 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(" ") << 
+           line->y2 << _T("\n");
+    node = node->GetNext();
+  }
 
-istream& DoodleSegment::LoadObject(istream& stream)
+  return stream;
+}
+#endif
+
+#if wxUSE_STD_IOSTREAM
+wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
 {
-  int n = 0;
+  wxInt32 n = 0;
   stream >> n;
 
   for (int i = 0; i < n; i++)
   {
     DoodleLine *line = new DoodleLine;
-    stream >> line->x1 >> line->y1 >> line->x2 >> line->y2;
+    stream >> line->x1 >> 
+                   line->y1 >> 
+           line->x2 >> 
+           line->y2;
     lines.Append(line);
   }
+  
   return stream;
 }
+#else
+wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
+{
+  wxTextInputStream text_stream( stream );
+
+  wxInt32 n = 0;
+  text_stream >> n;
 
+  for (int i = 0; i < n; i++)
+  {
+    DoodleLine *line = new DoodleLine;
+    text_stream >> line->x1 >> 
+                   line->y1 >> 
+           line->x2 >> 
+           line->y2;
+    lines.Append(line);
+  }
+  
+  return stream;
+}
+#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();
   }
 }
 
@@ -166,14 +268,14 @@ bool DrawingCommand::Do(void)
     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();
@@ -212,12 +314,12 @@ bool DrawingCommand::Undo(void)
     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();