remove wxNewEventFunctor() overload which allowed calls to "Bind(evt, &WrongClass...

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

diff --git a/samples/docview/doc.cpp b/samples/docview/doc.cpp
index 0116a79c2e84d0109bf45790db10bae2a0e1fa4f..f43bbb1c13c93ebc10bc67c8923567b2ab682178 100644 (file)
--- 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
 // 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$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart
+// Copyright:   (c) 1998 Julian Smart
+//              (c) 2008 Vadim Zeitlin

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #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
 #endif

-#ifdef __WXMAC__
-#include "wx/filename.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"

 #endif
 
 #if wxUSE_STD_IOSTREAM
 #endif
 
 #if wxUSE_STD_IOSTREAM


@@ -29,345 +35,184 @@
     #include "wx/txtstrm.h"
 #endif
 
     #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"
 #include "doc.h"
 #include "view.h"

+
+// ----------------------------------------------------------------------------
+// DrawingDocument implementation
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 
 IMPLEMENT_DYNAMIC_CLASS(DrawingDocument, wxDocument)
 

-DrawingDocument::~DrawingDocument(void)
+DocumentOstream& DrawingDocument::SaveObject(DocumentOstream& ostream)

 {
 {

-    WX_CLEAR_LIST(wxList, m_doodleSegments)
-}
-

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-wxSTD ostream& DrawingDocument::SaveObject(wxSTD ostream& stream)
-{
-    wxDocument::SaveObject(stream);
+    DocumentOstream& stream = ostream;
+#else
+    wxTextOutputStream stream(ostream);
+#endif
+
+    wxDocument::SaveObject(ostream);

 
 

-    wxInt32 n = m_doodleSegments.GetCount();
-    stream << n << '\n';
+    const wxInt32 count = m_doodleSegments.size();
+    stream << count << '\n';

 
 

-    wxList::compatibility_iterator node = m_doodleSegments.GetFirst();
-    while (node)
+    for ( int n = 0; n < count; n++ )

     {
     {

-        DoodleSegment *segment = (DoodleSegment *)node->GetData();
-        segment->SaveObject(stream);
+        m_doodleSegments[n].SaveObject(ostream);

         stream << '\n';
         stream << '\n';

-
-        node = node->GetNext();

     }
 
     }
 

-    return stream;
+    return ostream;

 }
 }

-#else
-wxOutputStream& DrawingDocument::SaveObject(wxOutputStream& stream)
+
+DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream)

 {
 {

-    wxDocument::SaveObject(stream);
+#if wxUSE_STD_IOSTREAM
+    DocumentIstream& stream = istream;
+#else
+    wxTextInputStream stream(istream);
+#endif

 
 

-    wxTextOutputStream text_stream( stream );
+    wxDocument::LoadObject(istream);

 
 

-    wxInt32 n = m_doodleSegments.GetCount();
-    text_stream << n << '\n';
+    wxInt32 count = 0;
+    stream >> count;

 
 

-    wxList::compatibility_iterator node = m_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(istream);
+        m_doodleSegments.push_back(segment);

     }
 
     }
 

-    return stream;
+    return istream;

 }
 }

-#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);
-        m_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);
-        m_doodleSegments.Append(segment);
-    }
+    DoUpdate();

 
 

-    return stream;
+    return true;

 }
 }

-#endif

 
 

-DoodleSegment::DoodleSegment(const DoodleSegment& seg):wxObject()
-{
-    wxList::compatibility_iterator node = seg.m_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;
-
-        m_lines.Append(newLine);
-
-        node = node->GetNext();
-    }
-}
+// ----------------------------------------------------------------------------
+// DoodleSegment implementation
+// ----------------------------------------------------------------------------

 
 

-DoodleSegment::~DoodleSegment(void)
+DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream)

 {
 {

-    WX_CLEAR_LIST(wxList, m_lines)
-}
-

 #if wxUSE_STD_IOSTREAM
 #if wxUSE_STD_IOSTREAM

-wxSTD ostream& DoodleSegment::SaveObject(wxSTD ostream& stream)
-{
-    wxInt32 n = m_lines.GetCount();
-    stream << n << '\n';
-
-    wxList::compatibility_iterator node = m_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
 #else

-wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
-{
-    wxTextOutputStream text_stream( stream );
+    wxTextOutputStream stream(ostream);
+#endif

 
 

-    wxInt32 n = m_lines.GetCount();
-    text_stream << n << wxT("\n");
+    const wxInt32 count = m_lines.size();
+    stream << count << '\n';

 
 

-    wxList::compatibility_iterator node = m_lines.GetFirst();
-    while (node)
+    for ( int n = 0; n < count; n++ )

     {
     {

-        DoodleLine* line = (DoodleLine*)node->GetData();
-        text_stream << line->x1 << wxT(" ") <<
-            line->y1 << wxT(" ") <<
-            line->x2 << wxT(" ") <<
-            line->y2 << wxT("\n");
-        node = node->GetNext();
+        const DoodleLine& line = m_lines[n];
+        stream
+            << line.x1 << ' '
+            << line.y1 << ' '
+            << line.x2 << ' '
+            << line.y2 << '\n';

     }
 
     }
 

-    return stream;
+    return ostream;

 }
 }

-#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;
-        m_lines.Append(line);
-    }
-
-    return stream;
-}
+#if wxUSE_STD_IOSTREAM
+    DocumentIstream& stream = istream;

 #else
 #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;
-        m_lines.Append(line);
+        DoodleLine line;
+        stream
+            >> line.x1
+            >> line.y1
+            >> line.x2
+            >> line.y2;
+        m_lines.push_back(line);

     }
 
     }
 

-    return stream;
+    return istream;

 }
 }

-#endif

 
 

-void DoodleSegment::Draw(wxDC *dc)
-{
-    wxList::compatibility_iterator node = m_lines.GetFirst();
-    while (node)
-    {
-        DoodleLine *line = (DoodleLine *)node->GetData();
-        dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
-        node = node->GetNext();
-    }
-}
+// ----------------------------------------------------------------------------
+// wxTextDocument: wxDocument and wxTextCtrl married
+// ----------------------------------------------------------------------------

 
 

-/*
-* Implementation of drawing command
-*/
+IMPLEMENT_CLASS(wxTextDocument, wxDocument)

 
 

-DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument* doc, DoodleSegment* seg) :
-    wxCommand(true, name)
+// Since text windows have their own method for saving to/loading from files,
+// we override DoSave/OpenDocument instead of Save/LoadObject
+bool wxTextDocument::DoSaveDocument(const wxString& filename)

 {
 {

-    m_doc = doc;
-    m_segment = seg;
-    m_cmd = command;
+    return GetTextCtrl()->SaveFile(filename);

 }
 
 }
 

-DrawingCommand::~DrawingCommand(void)
+bool wxTextDocument::DoOpenDocument(const wxString& filename)

 {
 {

-    if (m_segment)
-        delete m_segment;
+    return GetTextCtrl()->LoadFile(filename);

 }
 
 }
 

-bool DrawingCommand::Do(void)
+bool wxTextDocument::IsModified() const

 {
 {

-    switch (m_cmd)
-    {
-    case DOODLE_CUT:
-        {
-            // Cut the last segment
-            if (m_doc->GetDoodleSegments().GetCount() > 0)
-            {
-                wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast();
-                if (m_segment)
-                    delete m_segment;
-
-                m_segment = (DoodleSegment*)node->GetData();
-                m_doc->GetDoodleSegments().Erase(node);
-
-                m_doc->Modify(true);
-                m_doc->UpdateAllViews();
-            }
-            break;
-        }
-    case DOODLE_ADD:
-        {
-            m_doc->GetDoodleSegments().Append(new DoodleSegment(*m_segment));
-            m_doc->Modify(true);
-            m_doc->UpdateAllViews();
-            break;
-        }
-    }
-    return true;
+    wxTextCtrl* wnd = GetTextCtrl();
+    return wxDocument::IsModified() || (wnd && wnd->IsModified());

 }
 
 }
 

-bool DrawingCommand::Undo(void)
+void wxTextDocument::Modify(bool modified)

 {
 {

-    switch (m_cmd)
+    wxDocument::Modify(modified);
+
+    wxTextCtrl* wnd = GetTextCtrl();
+    if (wnd && !modified)

     {
     {

-    case DOODLE_CUT:
-        {
-            // Paste the segment
-            if (m_segment)
-            {
-                m_doc->GetDoodleSegments().Append(m_segment);
-                m_doc->Modify(true);
-                m_doc->UpdateAllViews();
-                m_segment = NULL;
-            }
-            m_doc->Modify(true);
-            m_doc->UpdateAllViews();
-            break;
-        }
-    case DOODLE_ADD:
-        {
-            // Cut the last segment
-            if (m_doc->GetDoodleSegments().GetCount() > 0)
-            {
-                wxList::compatibility_iterator node = m_doc->GetDoodleSegments().GetLast();
-                DoodleSegment* seg = (DoodleSegment*)node->GetData();
-                delete seg;
-                m_doc->GetDoodleSegments().Erase(node);
-
-                m_doc->Modify(true);
-                m_doc->UpdateAllViews();
-            }
-        }
+        wnd->DiscardEdits();

     }
     }

-    return true;

 }
 
 }
 

-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::DoSaveDocument(const wxString& filename)
-{
-    TextEditView* view = GetFirstView();
-
-    if (!view->m_textsw->SaveFile(filename))
-        return false;
-
-    return true;
-}
-
-bool TextEditDocument::DoOpenDocument(const wxString& filename)
-{
-    TextEditView* view = GetFirstView();
-    if (!view->m_textsw->LoadFile(filename))
-        return false;
+// ----------------------------------------------------------------------------
+// TextEditDocument implementation
+// ----------------------------------------------------------------------------

 
 

-    return true;
-}
-
-bool TextEditDocument::IsModified(void) const
-{
-    TextEditView* view = GetFirstView();
-    return (wxDocument::IsModified() || (view && view->m_textsw->IsModified()));
-}
-
-void TextEditDocument::Modify(bool mod)
-{
-    TextEditView* view = GetFirstView();
-
-    wxDocument::Modify(mod);
-
-    if (!mod && view && view->m_textsw)
-        view->m_textsw->DiscardEdits();
-}
+IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)

 
 

-TextEditView* TextEditDocument::GetFirstView() const
+wxTextCtrl* TextEditDocument::GetTextCtrl() const

 {
 {

-   wxView* view = wxDocument::GetFirstView();
-   return view ? wxStaticCast(view, TextEditView) : NULL;
+    wxView* view = GetFirstView();
+    return view ? wxStaticCast(view, TextEditView)->GetText() : NULL;

 }
 }

-