revisions contributed by Utensil Candel

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

diff --git a/samples/docvwmdi/doc.cpp b/samples/docvwmdi/doc.cpp
index e22f7aec597a52c930e02981e8a5dc227ed8ae46..cba38cb4979fb96f7432463c832b7b07ee86369b 100644 (file)
--- a/samples/docvwmdi/doc.cpp
+++ b/samples/docvwmdi/doc.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -23,44 +19,45 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
-#include "wx/txtstrm.h"
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
 
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+#else
+    #include "wx/txtstrm.h"
+#endif
+
 #include "doc.h"
 #include "view.h"
 
 IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 
-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);
-  
+
   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');
-    
+
     node = node->GetNext();
   }
-  
+
   return stream;
 }
 #else
@@ -72,17 +69,17 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 
   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');
-    
+
     node = node->GetNext();
   }
-  
+
   return stream;
 }
 #endif
@@ -91,7 +88,7 @@ wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
 wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
 {
   wxDocument::LoadObject(stream);
-  
+
   wxInt32 n = 0;
   stream >> n;
 
@@ -124,13 +121,11 @@ wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
   return stream;
 }
 #endif
-DoodleSegment::DoodleSegment(void)
-{
-}
 
-DoodleSegment::DoodleSegment(DoodleSegment& seg)
+DoodleSegment::DoodleSegment(const DoodleSegment& seg)
+              :wxObject()
 {
-  wxNode *node = seg.lines.GetFirst();
+  wxList::compatibility_iterator node = seg.lines.GetFirst();
   while (node)
   {
     DoodleLine *line = (DoodleLine *)node->GetData();
@@ -148,7 +143,7 @@ DoodleSegment::DoodleSegment(DoodleSegment& seg)
 
 DoodleSegment::~DoodleSegment(void)
 {
-  lines.DeleteContents(TRUE);
+  WX_CLEAR_LIST(wxList, lines);
 }
 
 #if wxUSE_STD_IOSTREAM
@@ -156,14 +151,14 @@ wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
 {
   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();
-    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();
   }
@@ -177,14 +172,14 @@ wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
 
   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();
-    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();
   }
@@ -202,13 +197,13 @@ wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
   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);
   }
-  
+
   return stream;
 }
 #else
@@ -222,19 +217,19 @@ wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
   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);
   }
-  
+
   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();
@@ -248,7 +243,7 @@ void DoodleSegment::Draw(wxDC *dc)
  */
 
 DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
-  wxCommand(TRUE, name)
+  wxCommand(true, name)
 {
   doc = ddoc;
   segment = seg;
@@ -270,14 +265,14 @@ bool DrawingCommand::Do(void)
       // 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;
-          
+
         segment = (DoodleSegment *)node->GetData();
-        delete node;
+        doc->GetDoodleSegments().Erase(node);
 
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
       }
       break;
@@ -285,12 +280,12 @@ bool DrawingCommand::Do(void)
     case DOODLE_ADD:
     {
       doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
-      doc->Modify(TRUE);
+      doc->Modify(true);
       doc->UpdateAllViews();
       break;
     }
   }
-  return TRUE;
+  return true;
 }
 
 bool DrawingCommand::Undo(void)
@@ -303,11 +298,11 @@ bool DrawingCommand::Undo(void)
       if (segment)
       {
         doc->GetDoodleSegments().Append(segment);
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
         segment = (DoodleSegment *) NULL;
       }
-      doc->Modify(TRUE);
+      doc->Modify(true);
       doc->UpdateAllViews();
       break;
     }
@@ -316,17 +311,17 @@ bool DrawingCommand::Undo(void)
       // 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;
-        delete node;
+        doc->GetDoodleSegments().Erase(node);
 
-        doc->Modify(TRUE);
+        doc->Modify(true);
         doc->UpdateAllViews();
       }
     }
   }
-  return TRUE;
+  return true;
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
@@ -338,21 +333,21 @@ bool TextEditDocument::OnSaveDocument(const wxString& 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))
-        return FALSE;
+        return false;
 
-    SetFilename(filename, TRUE);
-    Modify(FALSE);
+    SetFilename(filename, true);
+    Modify(false);
     UpdateAllViews();
-    return TRUE;
+    return true;
 }
 
 bool TextEditDocument::IsModified(void) const