removed src/gtk/eggtrayicon.h

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

diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
index 0516794afd32599793ea76d5eb382b2ffea70518..8a76e6b40ac990b515675c2392b172ad59d48b43 100644 (file)
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -120,7 +120,7 @@ csDiagramCommand::csDiagramCommand(const wxString& name, csDiagramDocument *doc,
 
 csDiagramCommand::~csDiagramCommand()
 {
 
 csDiagramCommand::~csDiagramCommand()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -147,14 +147,14 @@ void csDiagramCommand::InsertState(csCommandState* state)
 // Schedule all lines connected to the states to be cut.
 void csDiagramCommand::RemoveLines()
 {
 // Schedule all lines connected to the states to be cut.
 void csDiagramCommand::RemoveLines()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
         wxShape* shape = state->GetShapeOnCanvas();
         wxASSERT( (shape != NULL) );
 
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
         wxShape* shape = state->GetShapeOnCanvas();
         wxASSERT( (shape != NULL) );
 

-        wxNode *node1 = shape->GetLines().GetFirst();
+        wxObjectList::compatibility_iterator node1 = shape->GetLines().GetFirst();

         while (node1)
         {
             wxLineShape *line = (wxLineShape *)node1->GetData();
         while (node1)
         {
             wxLineShape *line = (wxLineShape *)node1->GetData();


@@ -172,7 +172,7 @@ void csDiagramCommand::RemoveLines()
 
 csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 {
 
 csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -185,7 +185,7 @@ csCommandState* csDiagramCommand::FindStateByShape(wxShape* shape)
 
 bool csDiagramCommand::Do()
 {
 
 bool csDiagramCommand::Do()
 {

-    wxNode* node = m_states.GetFirst();
+    wxObjectList::compatibility_iterator node = m_states.GetFirst();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();


@@ -200,7 +200,7 @@ bool csDiagramCommand::Undo()
 {
     // Undo in reverse order, so e.g. shapes get added
     // back before the lines do.
 {
     // Undo in reverse order, so e.g. shapes get added
     // back before the lines do.

-    wxNode* node = m_states.GetLast();
+    wxObjectList::compatibility_iterator node = m_states.GetLast();

     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();
     while (node)
     {
         csCommandState* state = (csCommandState*) node->GetData();