corrected Info.plist.in location

[wxWidgets.git] / contrib / samples / ogl / ogledit / view.cpp

diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp
index 3800e31106c31bcd6d28926165be68dee6cd8a8b..74f8f357fed82de079d5614a7abacbc16fa10a6e 100644 (file)
--- 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; */
   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
     {
 
     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
         }
         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.
     }
   }
   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;
 {
   DiagramDocument *doc = (DiagramDocument *)GetDocument();
   wxShape *theShape = NULL;

-  wxNode *node = doc->GetDiagram()->GetShapeList()->First();
+  wxNode *node = doc->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxShape *eachShape = (wxShape *)node->Data();
+    wxShape *eachShape = (wxShape *)node->GetData();

     if ((eachShape->GetParent() == NULL) && eachShape->Selected())
     {
       theShape = eachShape;
       node = NULL;
     }
     if ((eachShape->GetParent() == NULL) && eachShape->Selected())
     {
       theShape = eachShape;
       node = NULL;
     }

-    else node = node->Next();
+    else node = node->GetNext();

   }
   return theShape;
 }
   }
   return theShape;
 }