Compile fix for sound without threads. Not sure

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

diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index ecda6e4917a2858bc585468b5f1ebd2bf0f0fcf4..88a17da9ec636a6eb81348b1560b691de31787a1 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -222,7 +222,7 @@ bool DiagramCommand::Do(void)
     }
     case OGLEDIT_ADD_SHAPE:
     {
     }
     case OGLEDIT_ADD_SHAPE:
     {

-      wxShape *theShape = NULL;
+      wxShape *theShape;

       if (shape)
         theShape = shape; // Saved from undoing the shape
       else
       if (shape)
         theShape = shape; // Saved from undoing the shape
       else


@@ -253,7 +253,7 @@ bool DiagramCommand::Do(void)
     }
     case OGLEDIT_ADD_LINE:
     {
     }
     case OGLEDIT_ADD_LINE:
     {

-      wxShape *theShape = NULL;
+      wxShape *theShape;

       if (shape)
         theShape = shape; // Saved from undoing the line
       else
       if (shape)
         theShape = shape; // Saved from undoing the line
       else


@@ -424,13 +424,13 @@ bool DiagramCommand::Undo(void)
 // Remove each individual line connected to a shape by sending a command.
 void DiagramCommand::RemoveLines(wxShape *shape)
 {
 // Remove each individual line connected to a shape by sending a command.
 void DiagramCommand::RemoveLines(wxShape *shape)
 {

-  wxNode *node = shape->GetLines().First();
+  wxNode *node = shape->GetLines().GetFirst();

   while (node)
   {
   while (node)
   {

-    wxLineShape *line = (wxLineShape *)node->Data();
+    wxLineShape *line = (wxLineShape *)node->GetData();

     doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
     
     doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
     

-    node = shape->GetLines().First();
+    node = shape->GetLines().GetFirst();

   }
 }
 
   }
 }
 


@@ -455,10 +455,10 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
     {
       // Ensure no other shape is selected, to simplify Undo/Redo code
       bool redraw = FALSE;
     {
       // Ensure no other shape is selected, to simplify Undo/Redo code
       bool redraw = FALSE;

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

       while (node)
       {
       while (node)
       {

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

         if (eachShape->GetParent() == NULL)
         {
           if (eachShape->Selected())
         if (eachShape->GetParent() == NULL)
         {
           if (eachShape->Selected())


@@ -467,7 +467,7 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
             redraw = TRUE;
           }
         }
             redraw = TRUE;
           }
         }

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

       }
       GetShape()->Select(TRUE, &dc);
       if (redraw)
       }
       GetShape()->Select(TRUE, &dc);
       if (redraw)