X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23a54e14a71e9184c3c33c2ba39b10ee1dd029b6..76f1eb7e1f6be1d53c81fd3fa6ebb6f9c9b689b7:/samples/docview/doc.cpp

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index d679a53221..87a24dad4e 100644
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -5,14 +5,10 @@
 // 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__
-// #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -23,7 +19,15 @@
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
-#include "wx/txtstrm.h"
+#ifdef __WXMAC__
+#include "wx/filename.h"
+#endif
+
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+#else
+    #include "wx/txtstrm.h"
+#endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
@@ -31,304 +35,295 @@
 
 #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
-ostream& DrawingDocument::SaveObject(ostream& stream)
+wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
 {
-  wxDocument::SaveObject(stream);
-  
-  wxInt32 n = doodleSegments.Number();
-  stream << n << '\n';
-  
-  wxNode *node = doodleSegments.First();
-  while (node)
-  {
-    DoodleSegment *segment = (DoodleSegment *)node->Data();
-    segment->SaveObject(stream);
-    stream << '\n';
-    
-    node = node->Next();
-  }
-  
-  return stream;
+    wxDocument::SaveObject(stream);
+
+    wxInt32 n = doodleSegments.GetCount();
+    stream << n << '\n';
+
+    wxList::compatibility_iterator node = doodleSegments.GetFirst();
+    while (node)
+    {
+        DoodleSegment *segment = (DoodleSegment *)node->GetData();
+        segment->SaveObject(stream);
+        stream << '\n';
+
+        node = node->GetNext();
+    }
+
+    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;
+    wxDocument::SaveObject(stream);
+
+    wxTextOutputStream text_stream( stream );
+
+    wxInt32 n = doodleSegments.GetCount();
+    text_stream << n << '\n';
+
+    wxList::compatibility_iterator node = doodleSegments.GetFirst();
+    while (node)
+    {
+        DoodleSegment *segment = (DoodleSegment *)node->GetData();
+        segment->SaveObject(stream);
+        text_stream << '\n';
+
+        node = node->GetNext();
+    }
+
+    return stream;
 }
 #endif
 
 #if wxUSE_STD_IOSTREAM
-istream& DrawingDocument::LoadObject(istream& stream)
+wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
 {
-  wxDocument::LoadObject(stream);
-  
-  wxInt32 n = 0;
-  stream >> n;
-
-  for (int i = 0; i < n; i++)
-  {
-    DoodleSegment *segment = new DoodleSegment;
-    segment->LoadObject(stream);
-    doodleSegments.Append(segment);
-  }
-
-  return stream;
+    wxDocument::LoadObject(stream);
+
+    wxInt32 n = 0;
+    stream >> n;
+
+    for (int i = 0; i < n; i++)
+    {
+        DoodleSegment *segment = new DoodleSegment;
+        segment->LoadObject(stream);
+        doodleSegments.Append(segment);
+    }
+
+    return stream;
 }
 #else
 wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
 {
-  wxDocument::LoadObject(stream);
+    wxDocument::LoadObject(stream);
 
-  wxTextInputStream text_stream( stream );
+    wxTextInputStream text_stream( stream );
 
-  wxInt32 n = 0;
-  text_stream >> n;
+    wxInt32 n = 0;
+    text_stream >> n;
 
-  for (int i = 0; i < n; i++)
-  {
-    DoodleSegment *segment = new DoodleSegment;
-    segment->LoadObject(stream);
-    doodleSegments.Append(segment);
-  }
+    for (int i = 0; i < n; i++)
+    {
+        DoodleSegment *segment = new DoodleSegment;
+        segment->LoadObject(stream);
+        doodleSegments.Append(segment);
+    }
 
-  return stream;
+    return stream;
 }
 #endif
 
-DoodleSegment::DoodleSegment(void)
+DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject()
 {
-}
+    wxList::compatibility_iterator node = seg.lines.GetFirst();
+    while (node)
+    {
+        DoodleLine *line = (DoodleLine *)node->GetData();
+        DoodleLine *newLine = new DoodleLine;
+        newLine->x1 = line->x1;
+        newLine->y1 = line->y1;
+        newLine->x2 = line->x2;
+        newLine->y2 = line->y2;
 
-DoodleSegment::DoodleSegment(DoodleSegment& seg)
-{
-  wxNode *node = seg.lines.First();
-  while (node)
-  {
-    DoodleLine *line = (DoodleLine *)node->Data();
-    DoodleLine *newLine = new DoodleLine;
-    newLine->x1 = line->x1;
-    newLine->y1 = line->y1;
-    newLine->x2 = line->x2;
-    newLine->y2 = line->y2;
-
-    lines.Append(newLine);
-
-    node = node->Next();
-  }
+        lines.Append(newLine);
+
+        node = node->GetNext();
+    }
 }
 
 DoodleSegment::~DoodleSegment(void)
 {
-  lines.DeleteContents(TRUE);
+    WX_CLEAR_LIST(wxList, lines);
 }
 
 #if wxUSE_STD_IOSTREAM
-ostream& DoodleSegment::SaveObject(ostream& stream)
+wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
 {
-  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;
+    wxInt32 n = lines.GetCount();
+    stream << n << '\n';
+
+    wxList::compatibility_iterator node = lines.GetFirst();
+    while (node)
+    {
+        DoodleLine *line = (DoodleLine *)node->GetData();
+        stream << line->x1 << " " <<
+            line->y1 << " " <<
+            line->x2 << " " <<
+            line->y2 << "\n";
+        node = node->GetNext();
+    }
+
+    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();
-    text_stream << line->x1 << " " << 
-                   line->y1 << " " << 
-		   line->x2 << " " << 
-		   line->y2 << "\n";
-    node = node->Next();
-  }
-
-  return 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();
+    }
+
+    return stream;
 }
 #endif
 
 #if wxUSE_STD_IOSTREAM
-istream& DoodleSegment::LoadObject(istream& stream)
+wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
 {
-  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;
-    lines.Append(line);
-  }
-  
-  return stream;
+    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;
+        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;
+    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();
-  while (node)
-  {
-    DoodleLine *line = (DoodleLine *)node->Data();
-    dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
-    node = node->Next();
-  }
+    wxList::compatibility_iterator node = lines.GetFirst();
+    while (node)
+    {
+        DoodleLine *line = (DoodleLine *)node->GetData();
+        dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
+        node = node->GetNext();
+    }
 }
 
 /*
- * Implementation of drawing command
- */
+* Implementation of drawing command
+*/
 
 DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
-  wxCommand(TRUE, name)
+wxCommand(true, name)
 {
-  doc = ddoc;
-  segment = seg;
-  cmd = command;
+    doc = ddoc;
+    segment = seg;
+    cmd = command;
 }
 
 DrawingCommand::~DrawingCommand(void)
 {
-  if (segment)
-    delete segment;
+    if (segment)
+        delete segment;
 }
 
 bool DrawingCommand::Do(void)
 {
-  switch (cmd)
-  {
-    case DOODLE_CUT:
+    switch (cmd)
     {
-      // Cut the last segment
-      if (doc->GetDoodleSegments().Number() > 0)
-      {
-        wxNode *node = doc->GetDoodleSegments().Last();
-        if (segment)
-          delete segment;
-          
-        segment = (DoodleSegment *)node->Data();
-        delete node;
-
-        doc->Modify(TRUE);
-        doc->UpdateAllViews();
-      }
-      break;
-    }
+    case DOODLE_CUT:
+        {
+            // Cut the last segment
+            if (doc->GetDoodleSegments().GetCount() > 0)
+            {
+                wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
+                if (segment)
+                    delete segment;
+
+                segment = (DoodleSegment *)node->GetData();
+                doc->GetDoodleSegments().Erase(node);
+
+                doc->Modify(true);
+                doc->UpdateAllViews();
+            }
+            break;
+        }
     case DOODLE_ADD:
-    {
-      doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
-      doc->Modify(TRUE);
-      doc->UpdateAllViews();
-      break;
+        {
+            doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
+            doc->Modify(true);
+            doc->UpdateAllViews();
+            break;
+        }
     }
-  }
-  return TRUE;
+    return true;
 }
 
 bool DrawingCommand::Undo(void)
 {
-  switch (cmd)
-  {
-    case DOODLE_CUT:
+    switch (cmd)
     {
-      // Paste the segment
-      if (segment)
-      {
-        doc->GetDoodleSegments().Append(segment);
-        doc->Modify(TRUE);
-        doc->UpdateAllViews();
-        segment = (DoodleSegment *) NULL;
-      }
-      doc->Modify(TRUE);
-      doc->UpdateAllViews();
-      break;
-    }
+    case DOODLE_CUT:
+        {
+            // Paste the segment
+            if (segment)
+            {
+                doc->GetDoodleSegments().Append(segment);
+                doc->Modify(true);
+                doc->UpdateAllViews();
+                segment = (DoodleSegment *) NULL;
+            }
+            doc->Modify(true);
+            doc->UpdateAllViews();
+            break;
+        }
     case DOODLE_ADD:
-    {
-      // Cut the last segment
-      if (doc->GetDoodleSegments().Number() > 0)
-      {
-        wxNode *node = doc->GetDoodleSegments().Last();
-        DoodleSegment *seg = (DoodleSegment *)node->Data();
-        delete seg;
-        delete node;
-
-        doc->Modify(TRUE);
-        doc->UpdateAllViews();
-      }
+        {
+            // Cut the last segment
+            if (doc->GetDoodleSegments().GetCount() > 0)
+            {
+                wxList::compatibility_iterator node = doc->GetDoodleSegments().GetLast();
+                DoodleSegment *seg = (DoodleSegment *)node->GetData();
+                delete seg;
+                doc->GetDoodleSegments().Erase(node);
+
+                doc->Modify(true);
+                doc->UpdateAllViews();
+            }
+        }
     }
-  }
-  return TRUE;
+    return true;
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
@@ -340,40 +335,44 @@ 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);
+#ifdef __WXMAC__
+    wxFileName fn(filename) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif
+    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
 {
-  TextEditView *view = (TextEditView *)GetFirstView();
-  if (view)
-  {
-    return (wxDocument::IsModified() || view->textsw->IsModified());
-  }
-  else
-    return wxDocument::IsModified();
+    TextEditView *view = (TextEditView *)GetFirstView();
+    if (view)
+    {
+        return (wxDocument::IsModified() || view->textsw->IsModified());
+    }
+    else
+        return wxDocument::IsModified();
 }
 
 void TextEditDocument::Modify(bool mod)
 {
-  TextEditView *view = (TextEditView *)GetFirstView();
+    TextEditView *view = (TextEditView *)GetFirstView();
 
-  wxDocument::Modify(mod);
+    wxDocument::Modify(mod);
 
-  if (!mod && view && view->textsw)
-    view->textsw->DiscardEdits();
+    if (!mod && view && view->textsw)
+        view->textsw->DiscardEdits();
 }