link against oleacc.lib (needed by wxUSE_ACCESSIBILITY)

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

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index ac439325ff851d3666c17a46d958b5ecdfe62627..9bf54c304a2355357c42d802e2c053708bc0cdb1 100644 (file)
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -69,7 +69,7 @@ void DrawingView::OnDraw(wxDC *dc)
   dc->SetFont(*wxNORMAL_FONT);
   dc->SetPen(*wxBLACK_PEN);
 
   dc->SetFont(*wxNORMAL_FONT);
   dc->SetPen(*wxBLACK_PEN);
 

-  wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
+  wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();

   while (node)
   {
     DoodleSegment *seg = (DoodleSegment *)node->GetData();
   while (node)
   {
     DoodleSegment *seg = (DoodleSegment *)node->GetData();


@@ -106,7 +106,7 @@ bool DrawingView::OnClose(bool deleteWindow)
 
   // Clear the canvas in  case we're in single-window mode,
   // and the canvas stays.
 
   // 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;
 
   canvas->view = (wxView *) NULL;
   canvas = (MyCanvas *) NULL;
 


@@ -117,7 +117,7 @@ bool DrawingView::OnClose(bool deleteWindow)
   SetFrame((wxFrame*)NULL);
 
   Activate(FALSE);
   SetFrame((wxFrame*)NULL);
 
   Activate(FALSE);

-  
+

   if (deleteWindow)
   {
     delete frame;
   if (deleteWindow)
   {
     delete frame;


@@ -152,7 +152,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 
   frame->Show(TRUE);
   Activate(TRUE);
 
   frame->Show(TRUE);
   Activate(TRUE);

-  
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -169,7 +169,7 @@ bool TextEditView::OnClose(bool deleteWindow)
 {
   if (!GetDocument()->Close())
     return FALSE;
 {
   if (!GetDocument()->Close())
     return FALSE;

-    
+

   Activate(FALSE);
 
   if (deleteWindow)
   Activate(FALSE);
 
   if (deleteWindow)


@@ -208,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
   if (!view)
     return;
 {
   if (!view)
     return;

-    
+

   static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
 
   wxClientDC dc(this);
   static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
 
   wxClientDC dc(this);


@@ -236,19 +236,19 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
       currentSegment = (DoodleSegment *) NULL;
     }
   }
       currentSegment = (DoodleSegment *) NULL;
     }
   }

-  
+

   if (xpos > -1 && ypos > -1 && event.Dragging())
   {
     if (!currentSegment)
       currentSegment = new DoodleSegment;
 
     DoodleLine *newLine = new DoodleLine;
   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->y1 = (long)ypos;

-    newLine->x2 = pt.x; 
+    newLine->x2 = pt.x;

     newLine->y2 = pt.y;
     currentSegment->lines.Append(newLine);
     newLine->y2 = pt.y;
     currentSegment->lines.Append(newLine);

-    
+

     dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
   }
   xpos = pt.x;
     dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
   }
   xpos = pt.x;