X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1484b5cc701329c54bbe70f2a155119fd86945c7..0b9d77cef71f01559e2c81353efe623d25db63ad:/contrib/samples/ogl/ogledit/view.cpp?ds=sidebyside diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp index 3800e31106..74f8f357fe 100644 --- a/contrib/samples/ogl/ogledit/view.cpp +++ b/contrib/samples/ogl/ogledit/view.cpp @@ -127,16 +127,16 @@ void DiagramView::OnDraw(wxDC *dc) if (diagram_p->GetShapeList()) { /* wxCursor *old_cursor = NULL; */ - wxNode *current = diagram_p->GetShapeList()->First(); + wxNode *current = diagram_p->GetShapeList()->GetFirst(); while (current) // Loop through the entire list of shapes { - wxShape *object = (wxShape *)current->Data(); + wxShape *object = (wxShape *)current->GetData(); if (!object->GetParent()) { object->Draw(* dc); // Draw the shape onto our printing dc } - current = current->Next(); // Procede to the next shape in the list + current = current->GetNext(); // Procede to the next shape in the list } } dc->EndDrawing(); // Allows optimization of drawing code under MS Windows. @@ -177,16 +177,16 @@ wxShape *DiagramView::FindSelectedShape(void) { DiagramDocument *doc = (DiagramDocument *)GetDocument(); wxShape *theShape = NULL; - wxNode *node = doc->GetDiagram()->GetShapeList()->First(); + wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst(); while (node) { - wxShape *eachShape = (wxShape *)node->Data(); + wxShape *eachShape = (wxShape *)node->GetData(); if ((eachShape->GetParent() == NULL) && eachShape->Selected()) { theShape = eachShape; node = NULL; } - else node = node->Next(); + else node = node->GetNext(); } return theShape; }