Warning fixes, source cleaning.

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

diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index 0497b812bfd2d3d80837adf3fa0c1a4276ed05bc..cd44a0694c79016b72e04724d9d0a4dea3f5c662 100644 (file)
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -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;


@@ -418,7 +418,7 @@ void wxPlotArea::OnPaint( wxPaintEvent &WXUNUSED(event) )
         {
             wxPlotCurve *curve = (wxPlotCurve*) node->GetData();
             
         {
             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;
     


@@ -817,7 +817,7 @@ wxPlotCurve *wxPlotWindow::GetAt( size_t n )
     return (wxPlotCurve*) node->GetData();
 }
 
     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 );


@@ -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;
 }