diff --git a/common/basicframe.cpp b/common/basicframe.cpp index ef6867fb34..ca0bcb6b65 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2013 Wayne Stambaugh + * Copyright (C) 2013-2015 Wayne Stambaugh * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -72,7 +72,6 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType, m_Ident = aFrameType; m_mainToolBar = NULL; - m_FrameIsActive = true; m_hasAutoSave = false; m_autoSaveState = false; m_autoSaveInterval = -1; diff --git a/common/draw_frame.cpp b/common/draw_frame.cpp index 9b4fb0dba1..63d84ed9c0 100644 --- a/common/draw_frame.cpp +++ b/common/draw_frame.cpp @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2004 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr - * Copyright (C) 2008-2011 Wayne Stambaugh - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2004-2015 Jean-Pierre Charras, jean-pierre.charras@gipsa-lab.inpg.fr + * Copyright (C) 2008-2015 Wayne Stambaugh + * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -226,8 +226,6 @@ void EDA_DRAW_FRAME::EraseMsgBox() void EDA_DRAW_FRAME::OnActivate( wxActivateEvent& event ) { - m_FrameIsActive = event.GetActive(); - if( m_canvas ) m_canvas->SetCanStartBlock( -1 ); diff --git a/include/wxstruct.h b/include/wxstruct.h index 4b0c56a165..af98b1858a 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com - * Copyright (C) 2011 Wayne Stambaugh - * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2009-2015 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com + * Copyright (C) 2011-2015 Wayne Stambaugh + * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -118,7 +118,6 @@ protected: wxSize m_FrameSize; wxAuiToolBar* m_mainToolBar; ///< Standard horizontal Toolbar - bool m_FrameIsActive; wxString m_FrameName; ///< name used for writing and reading setup ///< It is "SchematicFrame", "PcbFrame" .... wxString m_AboutTitle; ///< Name of program displayed in About. @@ -200,8 +199,6 @@ public: wxString GetName() const { return m_FrameName; } - bool IsActive() const { return m_FrameIsActive; } - bool IsType( FRAME_T aType ) const { return m_Ident == aType; } void GetKicadHelp( wxCommandEvent& event ); diff --git a/pcbnew/footprint_wizard_frame.cpp b/pcbnew/footprint_wizard_frame.cpp index 69d2863aca..98334bdf5e 100644 --- a/pcbnew/footprint_wizard_frame.cpp +++ b/pcbnew/footprint_wizard_frame.cpp @@ -1,10 +1,10 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2012 Miguel Angel Ajo Pelayo - * Copyright (C) 2012 Jean-Pierre Charras, jaen-pierre.charras - * Copyright (C) 2008-2011 Wayne Stambaugh - * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo + * Copyright (C) 2012-2015 Jean-Pierre Charras, jaen-pierre.charras + * Copyright (C) 2008-2015 Wayne Stambaugh + * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -440,7 +440,7 @@ void FOOTPRINT_WIZARD_FRAME::OnActivate( wxActivateEvent& event ) EDA_DRAW_FRAME::OnActivate( event ); // Ensure we do not have old selection: - if( !m_FrameIsActive ) + if( !event.GetActive() ) return; bool footprintWizardsChanged = false; diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp index d11e85ab4e..f73f688f8a 100644 --- a/pcbnew/modview_frame.cpp +++ b/pcbnew/modview_frame.cpp @@ -1,9 +1,9 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2008-2011 Wayne Stambaugh - * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors. + * Copyright (C) 2012-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2008-2015 Wayne Stambaugh + * Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -551,7 +551,7 @@ void FOOTPRINT_VIEWER_FRAME::OnActivate( wxActivateEvent& event ) EDA_DRAW_FRAME::OnActivate( event ); // Ensure we do not have old selection: - if( ! m_FrameIsActive ) + if( !event.GetActive() ) return; // Ensure we have the right library list: