Applied patch which solved conflicts between wxWidgets

[wxWidgets.git] / samples / svg / svgtest.cpp

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index a20c1562d70a5e3eaf6b97d1458aeb85d5745875..96ba193cf86cd30dd1173d23def5b04be296fd0d 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -224,8 +224,8 @@ void MyFrame::OnClose(wxCloseEvent& event)
         return ;
     }
     // now try the children
         return ;
     }
     // now try the children

-    wxNode * pNode = m_children.GetFirst ();
-    wxNode * pNext ;
+    wxObjectList::compatibility_iterator pNode = m_children.GetFirst ();
+    wxObjectList::compatibility_iterator pNext ;

     MyChild * pChild ;
     while ( pNode )
     {
     MyChild * pChild ;
     while ( pNode )
     {


@@ -233,7 +233,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
         pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {
         pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {

-            delete pNode ;
+            m_children.Erase(pNode) ;

         }
         else
         {
         }
         else
         {