From ef12f0bcbcc7684072d95ebfdb4fcc6b5a0465fb Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Sun, 19 Mar 2017 09:17:33 -0400 Subject: [PATCH] Fix warning: shadowed wxWindow::IsShown in sim_plot_panel.h --- eeschema/sim/sim_plot_frame.cpp | 3 ++- eeschema/sim/sim_plot_panel.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index c327d332e3..5dec678973 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -2,6 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2016 CERN + * Copyright (C) 2016-2017 KiCad Developers, see AUTHORS.txt for contributors. * @author Tomasz Wlostowski * @author Maciej Suminski * @@ -446,7 +447,7 @@ void SIM_PLOT_FRAME::removePlot( const wxString& aPlotName, bool aErase ) traceMap.erase( traceIt ); } - wxASSERT( plotPanel->IsShown( aPlotName ) ); + wxASSERT( plotPanel->TraceShown( aPlotName ) ); plotPanel->DeleteTrace( aPlotName ); plotPanel->Fit(); diff --git a/eeschema/sim/sim_plot_panel.h b/eeschema/sim/sim_plot_panel.h index 3c3caa029b..77873d64f5 100644 --- a/eeschema/sim/sim_plot_panel.h +++ b/eeschema/sim/sim_plot_panel.h @@ -197,7 +197,7 @@ public: void DeleteAllTraces(); - bool IsShown( const wxString& aName ) const + bool TraceShown( const wxString& aName ) const { return m_traces.count( aName ) > 0; }