X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76cf603e9100d61bb4d184946071cf164092ce40..03c6117e8f6c958c1bc2602132ded643fc703cbf:/samples/docview/doc.cpp

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 82ddbae73f..1f1715d781 100644
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -1,26 +1,32 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        doc.cpp
+// Name:        samples/docview/doc.cpp
 // Purpose:     Implements document functionality
 // Author:      Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin: merge with the MDI version and general cleanup
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Copyright:   (c) 1998 Julian Smart
+//              (c) 2008 Vadim Zeitlin
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+    #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
 #endif
-#ifdef __WXMAC__
-#include "wx/filename.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
 #endif
 
 #if wxUSE_STD_IOSTREAM
@@ -29,350 +35,166 @@
     #include "wx/txtstrm.h"
 #endif
 
-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
-#endif
-
 #include "doc.h"
 #include "view.h"
-IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 
-DrawingDocument::~DrawingDocument(void)
-{
-    WX_CLEAR_LIST(wxList, doodleSegments);
-}
+// ----------------------------------------------------------------------------
+// DrawingDocument implementation
+// ----------------------------------------------------------------------------
 
-#if wxUSE_STD_IOSTREAM
-wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
+IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
+
+DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& stream)
 {
     wxDocument::SaveObject(stream);
 
-    wxInt32 n = doodleSegments.GetCount();
-    stream << n << '\n';
+    const wxInt32 count = m_doodleSegments.size();
+    stream << count << '\n';
 
-    wxList::compatibility_iterator node = doodleSegments.GetFirst();
-    while (node)
+    for ( int n = 0; n < count; n++ )
     {
-        DoodleSegment *segment = (DoodleSegment *)node->GetData();
-        segment->SaveObject(stream);
+        m_doodleSegments[n].SaveObject(stream);
         stream << '\n';
-
-        node = node->GetNext();
     }
 
     return stream;
 }
-#else
-wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
-{
-    wxDocument::SaveObject(stream);
 
-    wxTextOutputStream text_stream( stream );
+DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& stream)
+{
+    wxDocument::LoadObject(stream);
 
-    wxInt32 n = doodleSegments.GetCount();
-    text_stream << n << '\n';
+    wxInt32 count = 0;
+    stream >> count;
 
-    wxList::compatibility_iterator node = doodleSegments.GetFirst();
-    while (node)
+    for ( int n = 0; n < count; n++ )
     {
-        DoodleSegment *segment = (DoodleSegment *)node->GetData();
-        segment->SaveObject(stream);
-        text_stream << '\n';
-
-        node = node->GetNext();
+        DoodleSegment segment;
+        segment.LoadObject(stream);
+        m_doodleSegments.push_back(segment);
     }
 
     return stream;
 }
-#endif
 
-#if wxUSE_STD_IOSTREAM
-wxSTD istream& DrawingDocument::LoadObject(wxSTD istream& stream)
+void DrawingDocument::DoUpdate()
 {
-    wxDocument::LoadObject(stream);
-
-    wxInt32 n = 0;
-    stream >> n;
+    Modify(true);
+    UpdateAllViews();
+}
 
-    for (int i = 0; i < n; i++)
-    {
-        DoodleSegment *segment = new DoodleSegment;
-        segment->LoadObject(stream);
-        doodleSegments.Append(segment);
-    }
+void DrawingDocument::AddDoodleSegment(const DoodleSegment& segment)
+{
+    m_doodleSegments.push_back(segment);
 
-    return stream;
+    DoUpdate();
 }
-#else
-wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
+
+bool DrawingDocument::PopLastSegment(DoodleSegment *segment)
 {
-    wxDocument::LoadObject(stream);
+    if ( m_doodleSegments.empty() )
+        return false;
 
-    wxTextInputStream text_stream( stream );
+    if ( segment )
+        *segment = m_doodleSegments.back();
 
-    wxInt32 n = 0;
-    text_stream >> n;
+    m_doodleSegments.pop_back();
 
-    for (int i = 0; i < n; i++)
-    {
-        DoodleSegment *segment = new DoodleSegment;
-        segment->LoadObject(stream);
-        doodleSegments.Append(segment);
-    }
+    DoUpdate();
 
-    return stream;
+    return true;
 }
-#endif
-
-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;
-
-        lines.Append(newLine);
 
-        node = node->GetNext();
-    }
-}
+// ----------------------------------------------------------------------------
+// DoodleSegment implementation
+// ----------------------------------------------------------------------------
 
-DoodleSegment::~DoodleSegment(void)
+DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream)
 {
-    WX_CLEAR_LIST(wxList, lines);
-}
-
 #if wxUSE_STD_IOSTREAM
-wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& 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;
-}
+    DocumentOstream& stream = ostream;
 #else
-wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
-{
-    wxTextOutputStream text_stream( stream );
+    wxTextOutputStream stream(ostream);
+#endif
 
-    wxInt32 n = lines.GetCount();
-    text_stream << n << _T('\n');
+    const wxInt32 count = m_lines.size();
+    stream << count << '\n';
 
-    wxList::compatibility_iterator node = lines.GetFirst();
-    while (node)
+    for ( int n = 0; n < count; n++ )
     {
-        DoodleLine *line = (DoodleLine *)node->GetData();
-        text_stream << line->x1 << _T(" ") <<
-            line->y1 << _T(" ") <<
-            line->x2 << _T(" ") <<
-            line->y2 << _T("\n");
-        node = node->GetNext();
+        const DoodleLine& line = m_lines[n];
+        stream
+            << line.x1 << ' '
+            << line.y1 << ' '
+            << line.x2 << ' '
+            << line.y2 << '\n';
     }
 
     return stream;
 }
-#endif
 
-#if wxUSE_STD_IOSTREAM
-wxSTD istream& DoodleSegment::LoadObject(wxSTD istream& stream)
+DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)
 {
-    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;
-}
+#if wxUSE_STD_IOSTREAM
+    DocumentIstream& stream = istream;
 #else
-wxInputStream &DoodleSegment::LoadObject(wxInputStream& stream)
-{
-    wxTextInputStream text_stream( stream );
+    wxTextInputStream stream(istream);
+#endif
 
-    wxInt32 n = 0;
-    text_stream >> n;
+    wxInt32 count = 0;
+    stream >> count;
 
-    for (int i = 0; i < n; i++)
+    for ( int n = 0; n < count; n++ )
     {
-        DoodleLine *line = new DoodleLine;
-        text_stream >> line->x1 >>
-            line->y1 >>
-            line->x2 >>
-            line->y2;
-        lines.Append(line);
+        DoodleLine line;
+        stream
+            >> line.x1
+            >> line.y1
+            >> line.x2
+            >> line.y2;
+        m_lines.push_back(line);
     }
 
     return stream;
 }
-#endif
 
-void DoodleSegment::Draw(wxDC *dc)
-{
-    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
-*/
+// ----------------------------------------------------------------------------
+// TextEditDocument implementation
+// ----------------------------------------------------------------------------
 
-DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
-wxCommand(true, name)
-{
-    doc = ddoc;
-    segment = seg;
-    cmd = command;
-}
+IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
 
-DrawingCommand::~DrawingCommand(void)
+// Since text windows have their own method for saving to/loading from files,
+// we override DoSave/OpenDocument instead of Save/LoadObject
+bool TextEditDocument::DoSaveDocument(const wxString& filename)
 {
-    if (segment)
-        delete segment;
+    return GetFirstView()->GetText()->SaveFile(filename);
 }
 
-bool DrawingCommand::Do(void)
+bool TextEditDocument::DoOpenDocument(const wxString& filename)
 {
-    switch (cmd)
-    {
-    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;
-        }
-    }
-    return true;
+    return GetFirstView()->GetText()->LoadFile(filename);
 }
 
-bool DrawingCommand::Undo(void)
+bool TextEditDocument::IsModified() const
 {
-    switch (cmd)
-    {
-    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().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;
+    TextEditView* view = GetFirstView();
+    return wxDocument::IsModified() || (view && view->GetText()->IsModified());
 }
 
-IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
-
-// Since text windows have their own method for saving to/loading from files,
-// we override OnSave/OpenDocument instead of Save/LoadObject
-bool TextEditDocument::OnSaveDocument(const wxString& filename)
+void TextEditDocument::Modify(bool modified)
 {
-    TextEditView *view = (TextEditView *)GetFirstView();
+    TextEditView* view = GetFirstView();
 
-    if (!view->textsw->SaveFile(filename))
-        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;
+    wxDocument::Modify(modified);
 
-    SetFilename(filename, true);
-    Modify(false);
-    UpdateAllViews();
-    return true;
+    if ( !modified && view && view->GetText() )
+        view->GetText()->DiscardEdits();
 }
 
-bool TextEditDocument::IsModified(void) const
+TextEditView* TextEditDocument::GetFirstView() const
 {
-    TextEditView *view = (TextEditView *)GetFirstView();
-    if (view)
-    {
-        return (wxDocument::IsModified() || view->textsw->IsModified());
-    }
-    else
-        return wxDocument::IsModified();
+    wxView* view = wxDocument::GetFirstView();
+    return view ? wxStaticCast(view, TextEditView) : NULL;
 }
 
-void TextEditDocument::Modify(bool mod)
-{
-    TextEditView *view = (TextEditView *)GetFirstView();
-
-    wxDocument::Modify(mod);
-
-    if (!mod && view && view->textsw)
-        view->textsw->DiscardEdits();
-}