Replaced images

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

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index e22f7aec597a52c930e02981e8a5dc227ed8ae46..1da72d5f13fd7156ee269084c287966b57b4cfa7 100644 (file)
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -34,33 +34,29 @@
 
 IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 
 
 IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 

-DrawingDocument::DrawingDocument(void)
-{
-}
-

 DrawingDocument::~DrawingDocument(void)
 {
 DrawingDocument::~DrawingDocument(void)
 {

-  doodleSegments.DeleteContents(TRUE);
+  WX_CLEAR_LIST(wxList, doodleSegments);

 }
 
 #if wxUSE_STD_IOSTREAM
 wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
 {
   wxDocument::SaveObject(stream);
 }
 
 #if wxUSE_STD_IOSTREAM
 wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
 {
   wxDocument::SaveObject(stream);

-  
+

   wxInt32 n = doodleSegments.GetCount();
   stream << n << _T('\n');
   wxInt32 n = doodleSegments.GetCount();
   stream << n << _T('\n');

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

   while (node)
   {
     DoodleSegment *segment = (DoodleSegment *)node->GetData();
     segment->SaveObject(stream);
     stream << _T('\n');
   while (node)
   {
     DoodleSegment *segment = (DoodleSegment *)node->GetData();
     segment->SaveObject(stream);
     stream << _T('\n');

-    
+

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

-  
+

   return stream;
 }
 #else
   return stream;
 }
 #else


@@ -72,17 +68,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 
   wxInt32 n = doodleSegments.GetCount();
   text_stream << n << _T('\n');
 
   wxInt32 n = doodleSegments.GetCount();
   text_stream << n << _T('\n');

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

   while (node)
   {
     DoodleSegment *segment = (DoodleSegment *)node->GetData();
     segment->SaveObject(stream);
     text_stream << _T('\n');
   while (node)
   {
     DoodleSegment *segment = (DoodleSegment *)node->GetData();
     segment->SaveObject(stream);
     text_stream << _T('\n');

-    
+

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

-  
+

   return stream;
 }
 #endif
   return stream;
 }
 #endif


@@ -91,7 +87,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
 {
   wxDocument::LoadObject(stream);
 wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
 {
   wxDocument::LoadObject(stream);

-  
+

   wxInt32 n = 0;
   stream >> n;
 
   wxInt32 n = 0;
   stream >> n;
 


@@ -124,13 +120,11 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
   return stream;
 }
 #endif
   return stream;
 }
 #endif

-DoodleSegment::DoodleSegment(void)
-{
-}

 
 DoodleSegment::DoodleSegment(DoodleSegment& seg)
 
 DoodleSegment::DoodleSegment(DoodleSegment& seg)

+              :wxObject()

 {
 {

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

   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();
   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();


@@ -148,7 +142,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
 
 DoodleSegment::~DoodleSegment(void)
 {
 
 DoodleSegment::~DoodleSegment(void)
 {

-  lines.DeleteContents(TRUE);
+  WX_CLEAR_LIST(wxList, lines);

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -156,14 +150,14 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
 {
   wxInt32 n = lines.GetCount();
   stream << n << _T('\n');
 {
   wxInt32 n = lines.GetCount();
   stream << n << _T('\n');

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

   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();
   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();
   }
            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');
 
   wxInt32 n = lines.GetCount();
   text_stream << n << _T('\n');

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

   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();
   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();
   }
            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;
   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);
   }
            line->y2;
     lines.Append(line);
   }

-  
+

   return stream;
 }
 #else
   return stream;
 }
 #else


@@ -222,19 +216,19 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
   for (int i = 0; i < n; i++)
   {
     DoodleLine *line = new DoodleLine;
   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);
   }
            line->y2;
     lines.Append(line);
   }

-  
+

   return stream;
 }
 #endif
 void DoodleSegment::Draw(wxDC *dc)
 {
   return stream;
 }
 #endif
 void DoodleSegment::Draw(wxDC *dc)
 {

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

   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();
   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();


@@ -248,7 +242,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;


@@ -270,14 +264,14 @@ bool DrawingCommand::Do(void)
       // Cut the last segment
       if (doc->GetDoodleSegments().GetCount() > 0)
       {
       // Cut the last segment
       if (doc->GetDoodleSegments().GetCount() > 0)
       {

-        wxNode *node = doc->GetDoodleSegments().GetLast();
+        wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();

         if (segment)
           delete segment;
         if (segment)
           delete segment;

-          
+

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

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

 
 

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

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


@@ -285,12 +279,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)


@@ -303,11 +297,11 @@ 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;
     }
       doc->UpdateAllViews();
       break;
     }


@@ -316,17 +310,17 @@ bool DrawingCommand::Undo(void)
       // Cut the last segment
       if (doc->GetDoodleSegments().GetCount() > 0)
       {
       // Cut the last segment
       if (doc->GetDoodleSegments().GetCount() > 0)
       {

-        wxNode *node = doc->GetDoodleSegments().GetLast();
+        wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();

         DoodleSegment *seg = (DoodleSegment *)node->GetData();
         delete seg;
         DoodleSegment *seg = (DoodleSegment *)node->GetData();
         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)


@@ -338,21 +332,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