implemented wxNativeFontInfo::operator=() when wxUSE_PANGO, this fixes crashes when...

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

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index f8a7206fafc6221d1f37d3a5ddbda52db0095d64..4b7ee90dae1ecc8c461e492608506ecb6cc5803e 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$
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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 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"
 #endif
 
 #include "doc.h"


@@ -39,31 +40,59 @@ DrawingDocument::DrawingDocument(void)
 
 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);
 
 {
   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)
   {
   while (node)
   {

-    DoodleSegment *segment = (DoodleSegment *)node->Data();
+    DoodleSegment *segment = (DoodleSegment *)node->GetData();

     segment->SaveObject(stream);
     segment->SaveObject(stream);

-    stream << '\n';
+    text_stream << _T('\n');

     
     

-    node = node->Next();
+    node = node->GetNext();

   }
   }

+  

   return stream;
 }
   return stream;
 }

+#endif

 
 

-istream& DrawingDocument::LoadObject(istream& stream)
+#if wxUSE_STD_IOSTREAM
+wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)

 {
   wxDocument::LoadObject(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,17 +104,36 @@ 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(DoodleSegment& seg)
 {
 DoodleSegment::DoodleSegment(void)
 {
 }
 
 DoodleSegment::DoodleSegment(DoodleSegment& seg)
 {

-  wxNode *node = seg.lines.First();
+  wxList::compatibility_iterator node = seg.lines.GetFirst();

   while (node)
   {
   while (node)
   {

-    DoodleLine *line = (DoodleLine *)node->Data();
+    DoodleLine *line = (DoodleLine *)node->GetData();

     DoodleLine *newLine = new DoodleLine;
     newLine->x1 = line->x1;
     newLine->y1 = line->y1;
     DoodleLine *newLine = new DoodleLine;
     newLine->x1 = line->x1;
     newLine->y1 = line->y1;


@@ -94,50 +142,104 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
 
     lines.Append(newLine);
 
 
     lines.Append(newLine);
 

-    node = node->Next();
+    node = node->GetNext();

   }
 }
 
 DoodleSegment::~DoodleSegment(void)
 {
   }
 }
 
 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)
   {
   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;
 }
   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 >> 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);
   }
     lines.Append(line);
   }

+  

   return stream;
 }
   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)
 {
 void DoodleSegment::Draw(wxDC *dc)
 {

-  wxNode *node = lines.First();
+  wxList::compatibility_iterator node = lines.GetFirst();

   while (node)
   {
   while (node)
   {

-    DoodleLine *line = (DoodleLine *)node->Data();
+    DoodleLine *line = (DoodleLine *)node->GetData();

     dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
     dc->DrawLine(line->x1, line->y1, line->x2, line->y2);

-    node = node->Next();
+    node = node->GetNext();

   }
 }
 
   }
 }
 


@@ -146,7 +248,7 @@ void DoodleSegment::Draw(wxDC *dc)
  */
 
 DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
  */
 
 DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):

-  wxCommand(TRUE, name)
+  wxCommand(true, name)

 {
   doc = ddoc;
   segment = seg;
 {
   doc = ddoc;
   segment = seg;


@@ -166,16 +268,16 @@ bool DrawingCommand::Do(void)
     case DOODLE_CUT:
     {
       // Cut the last segment
     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;
           
         if (segment)
           delete segment;
           

-        segment = (DoodleSegment *)node->Data();
-        delete node;
+        segment = (DoodleSegment *)node->GetData();
+        doc->GetDoodleSegments().Erase(node);

 
 

-        doc->Modify(TRUE);
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
       break;
         doc->UpdateAllViews();
       }
       break;


@@ -183,12 +285,12 @@ bool DrawingCommand::Do(void)
     case DOODLE_ADD:
     {
       doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
     case DOODLE_ADD:
     {
       doc->GetDoodleSegments().Append(new DoodleSegment(*segment));

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
   }
       doc->UpdateAllViews();
       break;
     }
   }

-  return TRUE;
+  return true;

 }
 
 bool DrawingCommand::Undo(void)
 }
 
 bool DrawingCommand::Undo(void)


@@ -201,30 +303,30 @@ bool DrawingCommand::Undo(void)
       if (segment)
       {
         doc->GetDoodleSegments().Append(segment);
       if (segment)
       {
         doc->GetDoodleSegments().Append(segment);

-        doc->Modify(TRUE);
+        doc->Modify(true);

         doc->UpdateAllViews();
         segment = (DoodleSegment *) NULL;
       }
         doc->UpdateAllViews();
         segment = (DoodleSegment *) NULL;
       }

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
     case DOODLE_ADD:
     {
       // Cut the last segment
       doc->UpdateAllViews();
       break;
     }
     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 seg;

-        delete node;
+        doc->GetDoodleSegments().Erase(node);

 
 

-        doc->Modify(TRUE);
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
     }
   }
         doc->UpdateAllViews();
       }
     }
   }

-  return TRUE;
+  return true;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)


@@ -236,21 +338,21 @@ bool TextEditDocument::OnSaveDocument(const wxString& filename)
     TextEditView *view = (TextEditView *)GetFirstView();
 
     if (!view->textsw->SaveFile(filename))
     TextEditView *view = (TextEditView *)GetFirstView();
 
     if (!view->textsw->SaveFile(filename))

-        return FALSE;
-    Modify(FALSE);
-    return TRUE;
+        return false;
+    Modify(false);
+    return true;

 }
 
 bool TextEditDocument::OnOpenDocument(const wxString& filename)
 {
     TextEditView *view = (TextEditView *)GetFirstView();
     if (!view->textsw->LoadFile(filename))
 }
 
 bool TextEditDocument::OnOpenDocument(const wxString& filename)
 {
     TextEditView *view = (TextEditView *)GetFirstView();
     if (!view->textsw->LoadFile(filename))

-        return FALSE;
+        return false;

 
 

-    SetFilename(filename, TRUE);
-    Modify(FALSE);
+    SetFilename(filename, true);
+    Modify(false);

     UpdateAllViews();
     UpdateAllViews();

-    return TRUE;
+    return true;

 }
 
 bool TextEditDocument::IsModified(void) const
 }
 
 bool TextEditDocument::IsModified(void) const