compilation fix after r60017

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

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index d2a02dccdb24319ef7770dedb9f3cf6fcffc919d..d27e3f6a20f7a0a67a3ecc768f7398508c733f02 100644 (file)
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -1,11 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        view.cpp
-// Purpose:     View classes
+// Name:        samples/docview/view.cpp
+// Purpose:     View classes implementation

 // Author:      Julian Smart
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,56 +14,51 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE

-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!
+    #error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!

 #endif
 
 #include "docview.h"
 #include "doc.h"
 #include "view.h"
 
 #endif
 
 #include "docview.h"
 #include "doc.h"
 #include "view.h"
 

-IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView)
+// ----------------------------------------------------------------------------
+// DrawingView implementation
+// ----------------------------------------------------------------------------

 
 

-// For drawing lines in a canvas
-static float xpos = -1;
-static float ypos = -1;
+IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView)

 
 BEGIN_EVENT_TABLE(DrawingView, wxView)
 
 BEGIN_EVENT_TABLE(DrawingView, wxView)

-    EVT_MENU(DOODLE_CUT, DrawingView::OnCut)
+    EVT_MENU(wxID_CUT, DrawingView::OnCut)

 END_EVENT_TABLE()
 
 // What to do when a view is created. Creates actual
 // windows for displaying the view.
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
 END_EVENT_TABLE()
 
 // What to do when a view is created. Creates actual
 // windows for displaying the view.
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {

-    if (!singleWindowMode)
+    MyApp& app = wxGetApp();
+    if ( app.GetMode() != MyApp::Mode_Single )

     {
     {

-        // Multiple windows
-        m_frame = wxGetApp().CreateChildFrame(doc, this, true);
-        m_frame->SetTitle(wxT("DrawingView"));
-
-        m_canvas = GetMainFrame()->CreateCanvas(this, m_frame);
-#ifdef __X__
-        // X seems to require a forced resize
-        int x, y;
-        m_frame->GetSize(&x, &y);
-        m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
-#endif
+        // create a new window and canvas inside it
+        m_frame = app.CreateChildFrame(doc, this, true);
+        m_frame->SetTitle("Drawing View");
+
+        m_canvas = new MyCanvas(this, m_frame);

         m_frame->Show(true);
     }
         m_frame->Show(true);
     }

-    else
+    else // single document mode

     {
     {

-        // Single-window mode
-        m_frame = GetMainFrame();
-        m_canvas = GetMainFrame()->m_canvas;
-        m_canvas->m_view = this;
+        // reuse the existing window and canvas
+        m_frame = wxStaticCast(app.GetTopWindow(), wxFrame);
+        m_canvas = app.GetMainWindowCanvas();
+        m_canvas->SetView(this);

 
         // Associate the appropriate frame with this view.
         SetFrame(m_frame);
 
         // Associate the appropriate frame with this view.
         SetFrame(m_frame);


@@ -72,26 +68,34 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
         Activate(true);
 
         // Initialize the edit menu Undo and Redo items
         Activate(true);
 
         // Initialize the edit menu Undo and Redo items

-        doc->GetCommandProcessor()->SetEditMenu(((MyFrame*)m_frame)->m_editMenu);
+        doc->GetCommandProcessor()->SetEditMenu(app.GetMainWindowEditMenu());

         doc->GetCommandProcessor()->Initialize();
     }
 
     return true;
 }
 
         doc->GetCommandProcessor()->Initialize();
     }
 
     return true;
 }
 

-// Sneakily gets used for default print/preview
-// as well as drawing on the screen.
+// Sneakily gets used for default print/preview as well as drawing on the
+// screen.

 void DrawingView::OnDraw(wxDC *dc)
 {
 void DrawingView::OnDraw(wxDC *dc)
 {

-    dc->SetFont(*wxNORMAL_FONT);

     dc->SetPen(*wxBLACK_PEN);
 
     dc->SetPen(*wxBLACK_PEN);
 

-    wxList::compatibility_iterator node = GetDocument()->GetDoodleSegments().GetFirst();
-    while (node)
+    // simply draw all lines of all segments
+    const DoodleSegments& segments = GetDocument()->GetSegments();
+    for ( DoodleSegments::const_iterator i = segments.begin();
+          i != segments.end();
+          ++i )

     {
     {

-        DoodleSegment *seg = (DoodleSegment *)node->GetData();
-        seg->Draw(dc);
-        node = node->GetNext();
+        const DoodleLines& lines = i->GetLines();
+        for ( DoodleLines::const_iterator j = lines.begin(); 
+              j != lines.end();
+              ++j )
+        {
+            const DoodleLine& line = *j;
+
+            dc->DrawLine(line.x1, line.y1, line.x2, line.y2);
+        }

     }
 }
 
     }
 }
 


@@ -102,200 +106,179 @@ DrawingDocument* DrawingView::GetDocument()
 
 void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 {
 
 void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 {

-    if (m_canvas)
+    if ( m_canvas )

         m_canvas->Refresh();
         m_canvas->Refresh();

-
-/* Is the following necessary?
-#ifdef __WXMSW__
-    if (canvas)
-        canvas->Refresh();
-#else
-    if (canvas)
-    {
-        wxClientDC dc(canvas);
-        dc.Clear();
-        OnDraw(& dc);
-    }
-#endif
-*/

 }
 
 // Clean up windows used for displaying the view.
 bool DrawingView::OnClose(bool deleteWindow)
 {
 }
 
 // Clean up windows used for displaying the view.
 bool DrawingView::OnClose(bool deleteWindow)
 {

-    if (!GetDocument()->Close())
+    if ( !GetDocument()->Close() )

         return false;
 
         return false;
 

-    // Clear the canvas in  case we're in single-window mode,
-    // and the canvas stays.
-    m_canvas->ClearBackground();
-    m_canvas->m_view = NULL;
-    m_canvas = NULL;
-
-    wxString s(wxTheApp->GetAppDisplayName());
-    if (m_frame)
-        m_frame->SetTitle(s);
-
-    SetFrame(NULL);
-

     Activate(false);
 
     Activate(false);
 

-    if (deleteWindow && !singleWindowMode)
+    // Clear the canvas in single-window mode in which it stays alive
+    if ( wxGetApp().GetMode() == MyApp::Mode_Single )

     {
     {

-        delete m_frame;
-        return true;
+        m_canvas->ClearBackground();
+        m_canvas->ResetView();
+        m_canvas = NULL;
+
+        if ( m_frame )
+            m_frame->SetTitle(wxTheApp->GetAppDisplayName());

     }
     }

+    else // not single window mode
+    {
+        if ( deleteWindow )
+            wxDELETE(m_frame);
+    }
+
+    SetFrame(NULL);
+

     return true;
 }
 
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 {
     return true;
 }
 
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 {

-    DrawingDocument* doc = GetDocument();
-    doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Cut Last Segment"), DOODLE_CUT, doc, NULL));
+    DrawingDocument * const doc = GetDocument();
+
+    doc->GetCommandProcessor()->Submit(new DrawingRemoveSegmentCommand(doc));

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// TextEditView implementation
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 

-bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
+BEGIN_EVENT_TABLE(TextEditView, wxView)
+    EVT_MENU(wxID_COPY, TextEditView::OnCopy)
+    EVT_MENU(wxID_PASTE, TextEditView::OnPaste)
+    EVT_MENU(wxID_SELECTALL, TextEditView::OnSelectAll)
+END_EVENT_TABLE()
+
+bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags))

 {
     m_frame = wxGetApp().CreateChildFrame(doc, this, false);
 {
     m_frame = wxGetApp().CreateChildFrame(doc, this, false);

+    m_text = new wxTextCtrl(m_frame, wxID_ANY, "",
+                            wxPoint(0, 0), m_frame->GetClientSize(),
+                            wxTE_MULTILINE);

 
 

-    wxSize size = m_frame->GetClientSize();
-    m_textsw = new MyTextWindow(this, m_frame, wxPoint(0, 0), size, wxTE_MULTILINE);
-    m_frame->SetTitle(wxT("TextEditView"));
-
-#ifdef __X__
-    // X seems to require a forced resize
-    int x, y;
-    frame->GetSize(&x, &y);
-    frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
-#endif
-
+    m_frame->SetTitle("Text View");

     m_frame->Show(true);
     m_frame->Show(true);

+

     Activate(true);
 
     return true;
 }
 
     Activate(true);
 
     return true;
 }
 

-// Handled by wxTextWindow
-void TextEditView::OnDraw(wxDC *WXUNUSED(dc) )
-{
-}
-
-void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
+void TextEditView::OnDraw(wxDC *WXUNUSED(dc))

 {
 {

+    // nothing to do here, wxTextCtrl draws itself

 }
 
 bool TextEditView::OnClose(bool deleteWindow)
 {
 }
 
 bool TextEditView::OnClose(bool deleteWindow)
 {

-    if (!GetDocument()->Close())
+    if ( !GetDocument()->Close() )

         return false;
 
     Activate(false);
 
         return false;
 
     Activate(false);
 

-    if (deleteWindow)
+    if ( wxGetApp().GetMode() == MyApp::Mode_Single )

     {
     {

-        wxDELETE(m_frame)
-        return true;
+        m_text->Clear();

     }
     }

-    return true;
-}
-
-bool TextEditView::ProcessEvent(wxEvent& event)
-{
-    bool processed = false;
-    if (!processed) switch (event.GetId())
+    else // not single window mode

     {
     {

-        case wxID_COPY:
-        case wxID_PASTE:
-        case wxID_SELECTALL:
-            processed = m_textsw->ProcessEvent(event);
-            break;
+        if ( deleteWindow )
+            wxDELETE(m_frame);

     }
     }

-    if (!processed) processed = wxView::ProcessEvent(event);
-    return processed;
+
+    return true;

 }
 
 }
 

-/*
-* Window implementations
-*/
+// ----------------------------------------------------------------------------
+// MyCanvas implementation
+// ----------------------------------------------------------------------------

 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(MyCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas

-MyCanvas::MyCanvas(DrawingView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style):
-    wxScrolledWindow(frame, wxID_ANY, pos, size, style)
+MyCanvas::MyCanvas(wxView *view, wxWindow *parent)
+    : wxScrolledWindow(parent, wxID_ANY, wxPoint(0, 0), parent->GetClientSize())

 {
     m_view = view;
 {
     m_view = view;

+    m_currentSegment = NULL;
+    m_lastMousePos = wxDefaultPosition;
+
+    SetCursor(wxCursor(wxCURSOR_PENCIL));
+
+    // this is completely arbitrary and is done just for illustration purposes
+    SetVirtualSize(1000, 1000);
+    SetScrollRate(20, 20);
+
+    SetBackgroundColour(*wxWHITE);
+}
+
+MyCanvas::~MyCanvas()
+{
+    delete m_currentSegment;

 }
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
 }
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {

-    if (m_view)
+    if ( m_view )

         m_view->OnDraw(& dc);
 }
 
         m_view->OnDraw(& dc);
 }
 

-// This implements a tiny doodling program. Drag the mouse using
-// the left button.
+// This implements a tiny doodling program. Drag the mouse using the left
+// button.

 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
 void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {

-    if (!m_view)
+    if ( !m_view )

         return;
 
         return;
 

-    static DoodleSegment *currentSegment = NULL;
-

     wxClientDC dc(this);
     PrepareDC(dc);
 
     dc.SetPen(*wxBLACK_PEN);
 
     wxClientDC dc(this);
     PrepareDC(dc);
 
     dc.SetPen(*wxBLACK_PEN);
 

-    wxPoint pt(event.GetLogicalPosition(dc));
+    const wxPoint pt(event.GetLogicalPosition(dc));

 
 

-    if (currentSegment && event.LeftUp())
+    // is this the end of the current segment?
+    if ( m_currentSegment && event.LeftUp() )

     {
     {

-        if (currentSegment->m_lines.GetCount() == 0)
-        {
-            delete currentSegment;
-            currentSegment = NULL;
-        }
-        else
+        if ( !m_currentSegment->IsEmpty() )

         {
             // We've got a valid segment on mouse left up, so store it.
         {
             // We've got a valid segment on mouse left up, so store it.

-            DrawingDocument* doc = m_view->GetDocument();
+            DrawingDocument * const
+                doc = wxStaticCast(m_view->GetDocument(), DrawingDocument);

 
 

-            doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Add Segment"), DOODLE_ADD, doc, currentSegment));
+            doc->GetCommandProcessor()->Submit(
+                new DrawingAddSegmentCommand(doc, *m_currentSegment));

 
 

-            m_view->GetDocument()->Modify(true);
-            currentSegment = NULL;
+            doc->Modify(true);

         }
         }

+
+        delete m_currentSegment;
+        m_currentSegment = NULL;

     }
 
     }
 

-    if ( (xpos > -1) && (ypos > -1) && event.Dragging())
+    // is this the start of a new segment?
+    if ( m_lastMousePos != wxDefaultPosition && event.Dragging() )

     {
     {

-        if (!currentSegment)
-            currentSegment = new DoodleSegment;
+        if ( !m_currentSegment )
+            m_currentSegment = new DoodleSegment;

 
 

-        DoodleLine *newLine = new DoodleLine;
-        newLine->x1 = (long)xpos;
-        newLine->y1 = (long)ypos;
-        newLine->x2 = pt.x;
-        newLine->y2 = pt.y;
-        currentSegment->m_lines.Append(newLine);
+        m_currentSegment->AddLine(m_lastMousePos, pt);

 
 

-        dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
+        dc.DrawLine(m_lastMousePos, pt);

     }
     }

-    xpos = pt.x;
-    ypos = pt.y;
-}

 
 

-// Define a constructor for my text subwindow
-MyTextWindow::MyTextWindow(wxView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style):
-    wxTextCtrl(frame, wxID_ANY, wxEmptyString, pos, size, style)
-{
-    m_view = view;
+    m_lastMousePos = pt;

 }
 
 }
 

-