cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2004-05-19 23:01:08 +00:00
parent 003e6c07cc
commit 6c43b66ed0
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/include/wx/plot/plot.h
View File

@ -293,8 +293,8 @@ public:
size_t GetCount(); size_t GetCount();
wxPlotCurve *GetAt( size_t n ); wxPlotCurve *GetAt( size_t n );
void SetCurrent( wxPlotCurve* current ); void SetCurrentCurve( wxPlotCurve* current );
wxPlotCurve *GetCurrent(); wxPlotCurve *GetCurrentCurve();
// mark list accessors // mark list accessors
// ------------------- // -------------------

12
contrib/src/plot/plot.cpp
View File

@ -251,7 +251,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
event1.SetPosition( (int)floor(x/m_owner->GetZoom()) ); event1.SetPosition( (int)floor(x/m_owner->GetZoom()) );
m_owner->GetEventHandler()->ProcessEvent( event1 ); m_owner->GetEventHandler()->ProcessEvent( event1 );
if (curve != m_owner->GetCurrent()) if (curve != m_owner->GetCurrentCurve())
{ {
wxPlotEvent event2( wxEVT_PLOT_SEL_CHANGING, m_owner->GetId() ); wxPlotEvent event2( wxEVT_PLOT_SEL_CHANGING, m_owner->GetId() );
event2.SetEventObject( m_owner ); event2.SetEventObject( m_owner );
@ -259,7 +259,7 @@ void wxPlotArea::OnMouse( wxMouseEvent &event )
event2.SetCurve( curve ); event2.SetCurve( curve );
if (!m_owner->GetEventHandler()->ProcessEvent( event2 ) || event2.IsAllowed()) 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 ); dc.SetPen( *wxBLACK_PEN );
else else
dc.SetPen( *wxGREY_PEN ); 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_current = current;
m_area->Refresh( FALSE ); 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;
} }

8
docs/latex/wx/plotwindow.tex
View File

@ -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.