moved Destroy() to the beginning

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index aef8d1fbb1303210ff769cd2510b3d8604e35bee..d679a53221aeec3243e4db7fd410e4fe9e1ccfb9 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -23,9 +23,10 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif

+#include "wx/txtstrm.h"

 
 

-#if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_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"
 #endif
 
 #include "doc.h"


@@ -42,11 +43,14 @@ DrawingDocument::~DrawingDocument(void)
   doodleSegments.DeleteContents(TRUE);
 }
 
   doodleSegments.DeleteContents(TRUE);
 }
 

+#if wxUSE_STD_IOSTREAM

 ostream& DrawingDocument::SaveObject(ostream& stream)
 {
   wxDocument::SaveObject(stream);
 ostream& DrawingDocument::SaveObject(ostream& stream)
 {
   wxDocument::SaveObject(stream);

-
-  stream << doodleSegments.Number() << '\n';
+  
+  wxInt32 n = doodleSegments.Number();
+  stream << n << '\n';
+  

   wxNode *node = doodleSegments.First();
   while (node)
   {
   wxNode *node = doodleSegments.First();
   while (node)
   {


@@ -56,14 +60,39 @@ ostream& DrawingDocument::SaveObject(ostream& stream)
     
     node = node->Next();
   }
     
     node = node->Next();
   }

+  
+  return stream;
+}
+#else
+wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
+{
+  wxDocument::SaveObject(stream);
+
+  wxTextOutputStream text_stream( stream );
+
+  wxInt32 n = doodleSegments.Number();
+  text_stream << n << '\n';
+  
+  wxNode *node = doodleSegments.First();
+  while (node)
+  {
+    DoodleSegment *segment = (DoodleSegment *)node->Data();
+    segment->SaveObject(stream);
+    text_stream << '\n';
+    
+    node = node->Next();
+  }
+  

   return stream;
 }
   return stream;
 }

+#endif

 
 

+#if wxUSE_STD_IOSTREAM

 istream& DrawingDocument::LoadObject(istream& stream)
 {
   wxDocument::LoadObject(stream);
 istream& DrawingDocument::LoadObject(istream& stream)
 {
   wxDocument::LoadObject(stream);

-
-  int n = 0;
+  
+  wxInt32 n = 0;

   stream >> n;
 
   for (int i = 0; i < n; i++)
   stream >> n;
 
   for (int i = 0; i < n; i++)


@@ -75,6 +104,26 @@ istream& DrawingDocument::LoadObject(istream& stream)
 
   return 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(void)
 {


@@ -103,32 +152,87 @@ DoodleSegment::~DoodleSegment(void)
   lines.DeleteContents(TRUE);
 }
 
   lines.DeleteContents(TRUE);
 }
 

+#if wxUSE_STD_IOSTREAM

 ostream& DoodleSegment::SaveObject(ostream& stream)
 {
 ostream& DoodleSegment::SaveObject(ostream& stream)
 {

-  stream << lines.Number() << '\n';
+  wxInt32 n = lines.Number();
+  stream << n << '\n';
+  
+  wxNode *node = lines.First();
+  while (node)
+  {
+    DoodleLine *line = (DoodleLine *)node->Data();
+    stream << line->x1 << " " << 
+                   line->y1 << " " << 
+                  line->x2 << " " << 
+                  line->y2 << "\n";
+    node = node->Next();
+  }
+
+  return stream;
+}
+#else
+wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
+{
+  wxTextOutputStream text_stream( stream );
+
+  wxInt32 n = lines.Number();
+  text_stream << n << '\n';
+  

   wxNode *node = lines.First();
   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->Data();
   wxNode *node = lines.First();
   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->Data();

-    stream << line->x1 << " " << line->y1 << " " << line->x2 << " " << line->y2 << "\n";
+    text_stream << line->x1 << " " << 
+                   line->y1 << " " << 
+                  line->x2 << " " << 
+                  line->y2 << "\n";

     node = node->Next();
   }
     node = node->Next();
   }

+

   return stream;
 }
   return stream;
 }

+#endif

 
 

+#if wxUSE_STD_IOSTREAM

 istream& DoodleSegment::LoadObject(istream& stream)
 {
 istream& DoodleSegment::LoadObject(istream& stream)
 {

-  int n = 0;
+  wxInt32 n = 0;

   stream >> n;
 
   for (int i = 0; i < n; i++)
   {
     DoodleLine *line = new DoodleLine;
   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);
   }
     lines.Append(line);
   }

+  

   return stream;
 }
   return stream;
 }

+#endif

 
 void DoodleSegment::Draw(wxDC *dc)
 {
 
 void DoodleSegment::Draw(wxDC *dc)
 {