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 864981f878bc8c693411af8d4e947e1812995000..f43bbb1c13c93ebc10bc67c8923567b2ab682178 100644 (file)
--- a/samples/docview/doc.cpp
+++ b/samples/docview/doc.cpp
@@ -1,379 +1,218 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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 and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) 1998 Julian Smart
+//              (c) 2008 Vadim Zeitlin
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma implementation
-#endif
+// ----------------------------------------------------------------------------
+// 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
+
+#if !wxUSE_DOC_VIEW_ARCHITECTURE
+    #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 #endif

-#include "wx/txtstrm.h"

 
 

-#if !wxUSE_DOC_VIEW_ARCHITECTURE
-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+#else
+    #include "wx/txtstrm.h"

 #endif
 
 #include "doc.h"
 #include "view.h"
 
 #endif
 
 #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)

 {
 {

-}
+#if wxUSE_STD_IOSTREAM
+    DocumentOstream& stream = ostream;
+#else
+    wxTextOutputStream stream(ostream);
+#endif

 
 

-DrawingDocument::~DrawingDocument(void)
-{
-    doodleSegments.DeleteContents(TRUE);
-}
+    wxDocument::SaveObject(ostream);

 
 

-#if wxUSE_STD_IOSTREAM
-ostream& DrawingDocument::SaveObject(ostream& stream)
-{
-    wxDocument::SaveObject(stream);
-    
-    wxInt32 n = doodleSegments.Number();
-    stream << n << '\n';
-    
-    wxNode *node = doodleSegments.First();
-    while (node)
+    const wxInt32 count = m_doodleSegments.size();
+    stream << count << '\n';
+
+    for ( int n = 0; n < count; n++ )

     {
     {

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

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

-        
-        node = node->Next();
-    }
-    
-    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;
+
+    return ostream;

 }
 }

-#endif

 
 

-#if wxUSE_STD_IOSTREAM
-istream& DrawingDocument::LoadObject(istream& stream)
+DocumentIstream& DrawingDocument::LoadObject(DocumentIstream& istream)

 {
 {

-    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;
-}
+#if wxUSE_STD_IOSTREAM
+    DocumentIstream& stream = istream;

 #else
 #else

-wxInputStream& DrawingDocument::LoadObject(wxInputStream& stream)
-{
-    wxDocument::LoadObject(stream);
-    
-    wxTextInputStream text_stream( stream );
-    
-    wxInt32 n = 0;
-    text_stream >> n;
-    
-    for (int i = 0; i < n; i++)
-    {
-        DoodleSegment *segment = new DoodleSegment;
-        segment->LoadObject(stream);
-        doodleSegments.Append(segment);
-    }
-    
-    return stream;
-}
+    wxTextInputStream stream(istream);

 #endif
 
 #endif
 

-DoodleSegment::DoodleSegment(void)
-{
-}
+    wxDocument::LoadObject(istream);

 
 

-DoodleSegment::DoodleSegment(DoodleSegment& seg)
-{
-    wxNode *node = seg.lines.First();
-    while (node)
+    wxInt32 count = 0;
+    stream >> count;
+
+    for ( int n = 0; n < count; n++ )

     {
     {

-        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();
+        DoodleSegment segment;
+        segment.LoadObject(istream);
+        m_doodleSegments.push_back(segment);

     }
     }

+
+    return istream;

 }
 
 }
 

-DoodleSegment::~DoodleSegment(void)
+void DrawingDocument::DoUpdate()

 {
 {

-    lines.DeleteContents(TRUE);
+    Modify(true);
+    UpdateAllViews();

 }
 
 }
 

-#if wxUSE_STD_IOSTREAM
-ostream& DoodleSegment::SaveObject(ostream& stream)
+void DrawingDocument::AddDoodleSegment(const DoodleSegment& segment)

 {
 {

-    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;
+    m_doodleSegments.push_back(segment);
+
+    DoUpdate();

 }
 }

-#else
-wxOutputStream &DoodleSegment::SaveObject(wxOutputStream& stream)
+
+bool DrawingDocument::PopLastSegment(DoodleSegment *segment)

 {
 {

-    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;
+    if ( m_doodleSegments.empty() )
+        return false;
+
+    if ( segment )
+        *segment = m_doodleSegments.back();
+
+    m_doodleSegments.pop_back();
+
+    DoUpdate();
+
+    return true;

 }
 }

-#endif

 
 

-#if wxUSE_STD_IOSTREAM
-istream& DoodleSegment::LoadObject(istream& stream)
+// ----------------------------------------------------------------------------
+// DoodleSegment implementation
+// ----------------------------------------------------------------------------
+
+DocumentOstream& DoodleSegment::SaveObject(DocumentOstream& ostream)

 {
 {

-    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
+    DocumentOstream& stream = ostream;

 #else
 #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;
-}
+    wxTextOutputStream stream(ostream);

 #endif
 
 #endif
 

-void DoodleSegment::Draw(wxDC *dc)
-{
-    wxNode *node = lines.First();
-    while (node)
+    const wxInt32 count = m_lines.size();
+    stream << count << '\n';
+
+    for ( int n = 0; n < count; n++ )

     {
     {

-        DoodleLine *line = (DoodleLine *)node->Data();
-        dc->DrawLine(line->x1, line->y1, line->x2, line->y2);
-        node = node->Next();
+        const DoodleLine& line = m_lines[n];
+        stream
+            << line.x1 << ' '
+            << line.y1 << ' '
+            << line.x2 << ' '
+            << line.y2 << '\n';

     }
     }

-}
-
-/*
-* Implementation of drawing command
-*/

 
 

-DrawingCommand::DrawingCommand(const wxString& name, int command, DrawingDocument *ddoc, DoodleSegment *seg):
-wxCommand(TRUE, name)
-{
-    doc = ddoc;
-    segment = seg;
-    cmd = command;
+    return ostream;

 }
 
 }
 

-DrawingCommand::~DrawingCommand(void)
+DocumentIstream& DoodleSegment::LoadObject(DocumentIstream& istream)

 {
 {

-    if (segment)
-        delete segment;
-}
+#if wxUSE_STD_IOSTREAM
+    DocumentIstream& stream = istream;
+#else
+    wxTextInputStream stream(istream);
+#endif

 
 

-bool DrawingCommand::Do(void)
-{
-    switch (cmd)
-    {
-    case DOODLE_CUT:
-        {
-            // 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_ADD:
-        {
-            doc->GetDoodleSegments().Append(new DoodleSegment(*segment));
-            doc->Modify(TRUE);
-            doc->UpdateAllViews();
-            break;
-        }
-    }
-    return TRUE;
-}
+    wxInt32 count = 0;
+    stream >> count;

 
 

-bool DrawingCommand::Undo(void)
-{
-    switch (cmd)
+    for ( int n = 0; n < count; n++ )

     {
     {

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

     }
     }

-    return TRUE;
+
+    return istream;

 }
 
 }
 

-IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
+// ----------------------------------------------------------------------------
+// wxTextDocument: wxDocument and wxTextCtrl married
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxTextDocument, wxDocument)

 
 // Since text windows have their own method for saving to/loading from files,
 
 // 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)
+// we override DoSave/OpenDocument instead of Save/LoadObject
+bool wxTextDocument::DoSaveDocument(const wxString& filename)

 {
 {

-    TextEditView *view = (TextEditView *)GetFirstView();
-    
-    if (!view->textsw->SaveFile(filename))
-        return FALSE;
-    Modify(FALSE);
-    return TRUE;
+    return GetTextCtrl()->SaveFile(filename);

 }
 
 }
 

-bool TextEditDocument::OnOpenDocument(const wxString& filename)
+bool wxTextDocument::DoOpenDocument(const wxString& filename)

 {
 {

-    TextEditView *view = (TextEditView *)GetFirstView();
-    if (!view->textsw->LoadFile(filename))
-        return FALSE;
-    
-    SetFilename(filename, TRUE);
-    Modify(FALSE);
-    UpdateAllViews();
-    return TRUE;
+    return GetTextCtrl()->LoadFile(filename);
+}
+
+bool wxTextDocument::IsModified() const
+{
+    wxTextCtrl* wnd = GetTextCtrl();
+    return wxDocument::IsModified() || (wnd && wnd->IsModified());

 }
 
 }
 

-bool TextEditDocument::IsModified(void) const
+void wxTextDocument::Modify(bool modified)

 {
 {

-    TextEditView *view = (TextEditView *)GetFirstView();
-    if (view)
+    wxDocument::Modify(modified);
+
+    wxTextCtrl* wnd = GetTextCtrl();
+    if (wnd && !modified)

     {
     {

-        return (wxDocument::IsModified() || view->textsw->IsModified());
+        wnd->DiscardEdits();

     }
     }

-    else
-        return wxDocument::IsModified();

 }
 
 }
 

-void TextEditDocument::Modify(bool mod)
+// ----------------------------------------------------------------------------
+// TextEditDocument implementation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(TextEditDocument, wxDocument)
+
+wxTextCtrl* TextEditDocument::GetTextCtrl() const

 {
 {

-    TextEditView *view = (TextEditView *)GetFirstView();
-    
-    wxDocument::Modify(mod);
-    
-    if (!mod && view && view->textsw)
-        view->textsw->DiscardEdits();
+    wxView* view = GetFirstView();
+    return view ? wxStaticCast(view, TextEditView)->GetText() : NULL;

 }
 }