applied patch #940914 "Minor cleaning of warnings in contrib tree"

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
index b789e28c1473bd3c7ae06d39532429ebd1ed9d3d..f805a22a7d4cee14c3187fcf8c8fc9f3708f8099 100644 (file)
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -293,8 +293,8 @@ public:
     size_t GetCount();
     wxPlotCurve *GetAt( size_t n );
 
     size_t GetCount();
     wxPlotCurve *GetAt( size_t n );
 

-    void SetCurrent( wxPlotCurve* current );
-    wxPlotCurve *GetCurrent();
+    void SetCurrentCurve( wxPlotCurve* current );
+    wxPlotCurve *GetCurrentCurve();

 
     // mark list accessors
     // -------------------
 
     // mark list accessors
     // -------------------

diff --git a/contrib/src/deprecated/doslex.c b/contrib/src/deprecated/doslex.c
index f067467fa9788875ade73782763ca5ebe237f852..183785b110d2e6a4d390ac838e2182f679b6093a 100644 (file)
--- a/contrib/src/deprecated/doslex.c
+++ b/contrib/src/deprecated/doslex.c
@@ -680,10 +680,10 @@ do_action:        /* this label is used only to access EOF actions */
         {
           loop:
             #ifdef __cplusplus
         {
           loop:
             #ifdef __cplusplus

-                          while (yyinput() != '*');
+                          while (yyinput() != '*') ;

                           switch (yyinput())
             #else
                           switch (yyinput())
             #else

-                          while (input() != '*');
+                          while (input() != '*') ;

                           switch (input())
             #endif
               {
                           switch (input())
             #endif
               {

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

diff --git a/docs/latex/wx/plotwindow.tex b/docs/latex/wx/plotwindow.tex
index f8c08655c0f444aa95cad4696996336d5fb79358..c17b876bdb32ead356bbcbc7f3cb90335f572788 100644 (file)
--- a/docs/latex/wx/plotwindow.tex
+++ b/docs/latex/wx/plotwindow.tex
@@ -76,15 +76,15 @@ Returns number of curves.
 
 Get the nth curve.
 
 
 Get the nth curve.
 

-\membersection{wxPlotWindow::SetCurrent}\label{wxplotwindowsetcurrent}
+\membersection{wxPlotWindow::SetCurrentCurve}\label{wxplotwindowsetcurrentcurve}

 
 

-\func{void}{SetCurrent}{\param{wxPlotCurve* }{current}}
+\func{void}{SetCurrentCurve}{\param{wxPlotCurve* }{current}}

 
 Make one curve the current curve. This will emit a wxPlotEvent.
 
 
 Make one curve the current curve. This will emit a wxPlotEvent.
 

-\membersection{wxPlotWindow::GetCurrent}\label{wxplotwindowgetcurrent}
+\membersection{wxPlotWindow::GetCurrentCurve}\label{wxplotwindowgetcurrentcurve}

 
 

-\func{wxPlotCurve*}{GetCurrent}{\void}
+\func{wxPlotCurve*}{GetCurrentCurve}{\void}

 
 Returns a pointer to the current curve, or NULL.
 
 
 Returns a pointer to the current curve, or NULL.