compilation fix for gcc (closes bug 996701)

[wxWidgets.git] / contrib / src / plot / plot.cpp

diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index cfb39ec51917b915dbbc142e372302a87f009458..cd44a0694c79016b72e04724d9d0a4dea3f5c662 100644 (file)
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -229,7 +229,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
     x += view_x;
     y += view_y;
     
     x += view_x;
     y += view_y;
     

-    wxNode *node = m_owner->m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*)node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*)node->GetData();


@@ -251,7 +251,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
             event1.SetPosition( (int)floor(x/m_owner->GetZoom()) );
             m_owner->GetEventHandler()->ProcessEvent( event1 );
             
             event1.SetPosition( (int)floor(x/m_owner->GetZoom()) );
             m_owner->GetEventHandler()->ProcessEvent( event1 );
             

-            if (curve != m_owner->GetCurrent())
+            if (curve != m_owner->GetCurrentCurve())

             {
                 wxPlotEvent event2( wxEVT_PLOT_SEL_CHANGING, m_owner->GetId() );
                 event2.SetEventObject( m_owner );
             {
                 wxPlotEvent event2( wxEVT_PLOT_SEL_CHANGING, m_owner->GetId() );
                 event2.SetEventObject( m_owner );


@@ -259,7 +259,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
                 event2.SetCurve( curve );
                 if (!m_owner->GetEventHandler()->ProcessEvent( event2 ) || event2.IsAllowed())
                 {
                 event2.SetCurve( curve );
                 if (!m_owner->GetEventHandler()->ProcessEvent( event2 ) || event2.IsAllowed())
                 {

-                    m_owner->SetCurrent( curve );
+                    m_owner->SetCurrentCurve( curve );

                 }
             }
             return;
                 }
             }
             return;


@@ -413,12 +413,12 @@ void wxPlotArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
 */
         
         }
 */
         

-        wxNode *node = m_owner->m_curves.GetFirst();
+        wxList::compatibility_iterator node = m_owner->m_curves.GetFirst();

         while (node)
         {
             wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
             
         while (node)
         {
             wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
             

-            if (curve == m_owner->GetCurrent())
+            if (curve == m_owner->GetCurrentCurve())

                 dc.SetPen( *wxBLACK_PEN );
             else
                 dc.SetPen( *wxGREY_PEN );
                 dc.SetPen( *wxBLACK_PEN );
             else
                 dc.SetPen( *wxGREY_PEN );


@@ -606,7 +606,7 @@ void wxPlotYAxisArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc( this );
     
 {
     wxPaintDC dc( this );
     

-    wxPlotCurve *curve = m_owner->GetCurrent();
+    wxPlotCurve *curve = m_owner->GetCurrentCurve();

     
     if (!curve) return;
     
     
     if (!curve) return;
     


@@ -810,14 +810,14 @@ size_t wxPlotWindow::GetCount()
 
 wxPlotCurve *wxPlotWindow::GetAt( size_t n )
 {
 
 wxPlotCurve *wxPlotWindow::GetAt( size_t n )
 {

-    wxNode *node = m_curves.Item( n );
+    wxList::compatibility_iterator node = m_curves.Item( n );

     if (!node)
         return (wxPlotCurve*) NULL;
         
     return (wxPlotCurve*) node->GetData();
 }
 
     if (!node)
         return (wxPlotCurve*) NULL;
         
     return (wxPlotCurve*) node->GetData();
 }
 

-void wxPlotWindow::SetCurrent( wxPlotCurve* current )
+void wxPlotWindow::SetCurrentCurve( wxPlotCurve* current )

 {
     m_current = current;
     m_area->Refresh( FALSE );
 {
     m_current = current;
     m_area->Refresh( FALSE );


@@ -833,7 +833,7 @@ void wxPlotWindow::SetCurrent( wxPlotCurve* current )
 
 void wxPlotWindow::Delete( wxPlotCurve* curve )
 {
 
 void wxPlotWindow::Delete( wxPlotCurve* curve )
 {

-    wxNode *node = m_curves.Find( curve );
+    wxList::compatibility_iterator node = m_curves.Find( curve );

     if (!node) return;
     
     m_curves.DeleteObject( curve );
     if (!node) return;
     
     m_curves.DeleteObject( curve );


@@ -844,7 +844,7 @@ void wxPlotWindow::Delete( wxPlotCurve* curve )
     if (curve == m_current) m_current = (wxPlotCurve *) NULL;
 }
 
     if (curve == m_current) m_current = (wxPlotCurve *) NULL;
 }
 

-wxPlotCurve *wxPlotWindow::GetCurrent()
+wxPlotCurve *wxPlotWindow::GetCurrentCurve()

 {
     return m_current;
 }
 {
     return m_current;
 }


@@ -856,7 +856,7 @@ void wxPlotWindow::Add( wxPlotOnOffCurve *curve )
 
 void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
 {
 
 void wxPlotWindow::Delete( wxPlotOnOffCurve* curve )
 {

-    wxNode *node = m_onOffCurves.Find( curve );
+    wxList::compatibility_iterator node = m_onOffCurves.Find( curve );

     if (!node) return;
     
     m_onOffCurves.DeleteObject( curve );
     if (!node) return;
     
     m_onOffCurves.DeleteObject( curve );


@@ -869,7 +869,7 @@ size_t wxPlotWindow::GetOnOffCurveCount()
 
 wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
 {
 
 wxPlotOnOffCurve *wxPlotWindow::GetOnOffCurveAt( size_t n )
 {

-    wxNode *node = m_onOffCurves.Item( n );
+    wxList::compatibility_iterator node = m_onOffCurves.Item( n );

     if (!node)
         return (wxPlotOnOffCurve*) NULL;
         
     if (!node)
         return (wxPlotOnOffCurve*) NULL;
         


@@ -950,7 +950,7 @@ void wxPlotWindow::SetZoom( double zoom )
     GetViewStart( &view_x, &view_y );
     
     wxInt32 max = 0;
     GetViewStart( &view_x, &view_y );
     
     wxInt32 max = 0;

-    wxNode *node = m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();


@@ -970,7 +970,7 @@ void wxPlotWindow::SetZoom( double zoom )
 void wxPlotWindow::ResetScrollbar()
 {
     wxInt32 max = 0;
 void wxPlotWindow::ResetScrollbar()
 {
     wxInt32 max = 0;

-    wxNode *node = m_curves.GetFirst();
+    wxList::compatibility_iterator node = m_curves.GetFirst();

     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
     while (node)
     {
         wxPlotCurve *curve = (wxPlotCurve*) node->GetData();