X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..e5ef1cae0f424be0bffbd651cb10052dfb208396:/samples/docview/view.cpp diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp index c288676c5c..4cbb1e6084 100644 --- a/samples/docview/view.cpp +++ b/samples/docview/view.cpp @@ -5,14 +5,10 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// 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" @@ -35,8 +31,8 @@ IMPLEMENT_DYNAMIC_CLASS(DrawingView, wxView) // For drawing lines in a canvas -float xpos = -1; -float ypos = -1; +static float xpos = -1; +static float ypos = -1; BEGIN_EVENT_TABLE(DrawingView, wxView) EVT_MENU(DOODLE_CUT, DrawingView::OnCut) @@ -49,38 +45,38 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) if (!singleWindowMode) { // Multiple windows - frame = wxGetApp().CreateChildFrame(doc, this, TRUE); - frame->SetTitle(_T("DrawingView")); - - canvas = GetMainFrame()->CreateCanvas(this, frame); + 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; - frame->GetSize(&x, &y); - frame->SetSize(-1, -1, x, y); + m_frame->GetSize(&x, &y); + m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); #endif - frame->Show(TRUE); + m_frame->Show(true); } else { // Single-window mode - frame = GetMainFrame(); - canvas = GetMainFrame()->canvas; - canvas->view = this; - + m_frame = GetMainFrame(); + m_canvas = GetMainFrame()->m_canvas; + m_canvas->m_view = this; + // Associate the appropriate frame with this view. - SetFrame(frame); - + SetFrame(m_frame); + // Make sure the document manager knows that this is the // current view. - Activate(TRUE); - + Activate(true); + // Initialize the edit menu Undo and Redo items - doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu); + doc->GetCommandProcessor()->SetEditMenu(((MyFrame*)m_frame)->m_editMenu); doc->GetCommandProcessor()->Initialize(); } - - return TRUE; + + return true; } // Sneakily gets used for default print/preview @@ -89,8 +85,8 @@ void DrawingView::OnDraw(wxDC *dc) { dc->SetFont(*wxNORMAL_FONT); dc->SetPen(*wxBLACK_PEN); - - wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst(); + + wxList::compatibility_iterator node = GetDocument()->GetDoodleSegments().GetFirst(); while (node) { DoodleSegment *seg = (DoodleSegment *)node->GetData(); @@ -99,11 +95,16 @@ void DrawingView::OnDraw(wxDC *dc) } } +DrawingDocument* DrawingView::GetDocument() +{ + return wxStaticCast(wxView::GetDocument(), DrawingDocument); +} + void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)) { - if (canvas) - canvas->Refresh(); - + if (m_canvas) + m_canvas->Refresh(); + /* Is the following necessary? #ifdef __WXMSW__ if (canvas) @@ -123,58 +124,63 @@ void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint)) bool DrawingView::OnClose(bool deleteWindow) { if (!GetDocument()->Close()) - return FALSE; - + return false; + // Clear the canvas in case we're in single-window mode, // and the canvas stays. - canvas->Clear(); - canvas->view = (wxView *) NULL; - canvas = (MyCanvas *) NULL; - - wxString s(wxTheApp->GetAppName()); - if (frame) - frame->SetTitle(s); - - SetFrame((wxFrame *) NULL); - - Activate(FALSE); - + 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); + if (deleteWindow && !singleWindowMode) { - delete frame; - return TRUE; + delete m_frame; + return true; } - return TRUE; + return true; } void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) ) { - DrawingDocument *doc = (DrawingDocument *)GetDocument(); - doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Cut Last Segment"), DOODLE_CUT, doc, (DoodleSegment *) NULL)); + DrawingDocument* doc = GetDocument(); + doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Cut Last Segment"), DOODLE_CUT, doc, NULL)); } IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView) +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) ) { - frame = wxGetApp().CreateChildFrame(doc, this, FALSE); - - int width, height; - frame->GetClientSize(&width, &height); - textsw = new MyTextWindow(this, frame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE); - frame->SetTitle(_T("TextEditView")); - + m_frame = wxGetApp().CreateChildFrame(doc, this, false); + + 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(-1, -1, x, y); + m_frame->GetSize(&x, &y); + m_frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y); #endif - - frame->Show(TRUE); - Activate(TRUE); - - return TRUE; + + m_frame->Show(true); + Activate(true); + + return true; } // Handled by wxTextWindow @@ -189,16 +195,16 @@ void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) bool TextEditView::OnClose(bool deleteWindow) { if (!GetDocument()->Close()) - return FALSE; - - Activate(FALSE); - + return false; + + Activate(false); + if (deleteWindow) { - delete frame; - return TRUE; + wxDELETE(m_frame) + return true; } - return TRUE; + return true; } /* @@ -210,66 +216,66 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) END_EVENT_TABLE() // Define a constructor for my canvas -MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style): - wxScrolledWindow(frame, -1, pos, size, style) +MyCanvas::MyCanvas(DrawingView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style): + wxScrolledWindow(frame, wxID_ANY, pos, size, style) { - view = v; + m_view = view; } // Define the repainting behaviour void MyCanvas::OnDraw(wxDC& dc) { - if (view) - view->OnDraw(& dc); + if (m_view) + m_view->OnDraw(& dc); } // This implements a tiny doodling program. Drag the mouse using // the left button. void MyCanvas::OnMouseEvent(wxMouseEvent& event) { - if (!view) + if (!m_view) return; - - static DoodleSegment *currentSegment = (DoodleSegment *) NULL; - + + static DoodleSegment *currentSegment = NULL; + wxClientDC dc(this); PrepareDC(dc); - + dc.SetPen(*wxBLACK_PEN); - + wxPoint pt(event.GetLogicalPosition(dc)); - + if (currentSegment && event.LeftUp()) { - if (currentSegment->lines.GetCount() == 0) + if (currentSegment->m_lines.GetCount() == 0) { delete currentSegment; - currentSegment = (DoodleSegment *) NULL; + currentSegment = NULL; } else { // We've got a valid segment on mouse left up, so store it. - DrawingDocument *doc = (DrawingDocument *)view->GetDocument(); - - doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment)); - - view->GetDocument()->Modify(TRUE); - currentSegment = (DoodleSegment *) NULL; + DrawingDocument* doc = m_view->GetDocument(); + + doc->GetCommandProcessor()->Submit(new DrawingCommand(wxT("Add Segment"), DOODLE_ADD, doc, currentSegment)); + + m_view->GetDocument()->Modify(true); + currentSegment = NULL; } } - - if (xpos > -1 && ypos > -1 && event.Dragging()) + + if ( (xpos > -1) && (ypos > -1) && event.Dragging()) { if (!currentSegment) currentSegment = new DoodleSegment; - + DoodleLine *newLine = new DoodleLine; - newLine->x1 = (long)xpos; + newLine->x1 = (long)xpos; newLine->y1 = (long)ypos; - newLine->x2 = pt.x; + newLine->x2 = pt.x; newLine->y2 = pt.y; - currentSegment->lines.Append(newLine); - + currentSegment->m_lines.Append(newLine); + dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y); } xpos = pt.x; @@ -277,10 +283,10 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) } // Define a constructor for my text subwindow -MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style): - wxTextCtrl(frame, -1, _T(""), pos, size, style) +MyTextWindow::MyTextWindow(wxView* view, wxFrame* frame, const wxPoint& pos, const wxSize& size, const long style): + wxTextCtrl(frame, wxID_ANY, wxEmptyString, pos, size, style) { - view = v; + m_view = view; }