X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd5206ddbc5510ee880fe82fb4780fd4f53bd6e7..3682ea7d2cafc2cbb3f9093e0f864dfff54327dd:/samples/docvwmdi/view.cpp?ds=sidebyside diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp index 28bbd9ab50..9bf54c304a 100644 --- a/samples/docvwmdi/view.cpp +++ b/samples/docvwmdi/view.cpp @@ -106,7 +106,7 @@ bool DrawingView::OnClose(bool deleteWindow) // Clear the canvas in case we're in single-window mode, // and the canvas stays. - canvas->Clear(); + canvas->ClearBackground(); canvas->view = (wxView *) NULL; canvas = (MyCanvas *) NULL; @@ -117,7 +117,7 @@ bool DrawingView::OnClose(bool deleteWindow) SetFrame((wxFrame*)NULL); Activate(FALSE); - + if (deleteWindow) { delete frame; @@ -152,7 +152,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) ) frame->Show(TRUE); Activate(TRUE); - + return TRUE; } @@ -169,7 +169,7 @@ bool TextEditView::OnClose(bool deleteWindow) { if (!GetDocument()->Close()) return FALSE; - + Activate(FALSE); if (deleteWindow) @@ -208,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) { if (!view) return; - + static DoodleSegment *currentSegment = (DoodleSegment *) NULL; wxClientDC dc(this); @@ -236,19 +236,19 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event) currentSegment = (DoodleSegment *) NULL; } } - + 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); - + dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y); } xpos = pt.x;