Commit ca065833 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Remove EDA_DRAW_FRAME::IsActive() and replace with wxFrame::IsActive().

parent ebb967c4

common/basicframe.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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 <stambaughw@verizon.net>

 * Copyright (C) 2013-2015 Wayne Stambaugh <stambaughw@verizon.net>

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

common/draw_frame.cpp

+3 −5
Original line number Diff line number Diff line 
/*

 * 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 <stambaughw@verizon.net>

 * 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 <stambaughw@verizon.net>

 * 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 );

include/wxstruct.h

+3 −6
Original line number Diff line number Diff line 
/*

 * 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 <stambaughw@verizon.net>

 * 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 <stambaughw@verizon.net>

 * 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 );

pcbnew/footprint_wizard_frame.cpp

+5 −5
Original line number Diff line number Diff line 
/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 2012 Miguel Angel Ajo Pelayo <miguelangel@nbee.es>

 * Copyright (C) 2012 Jean-Pierre Charras, jaen-pierre.charras

 * Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>

 * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.

 * Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <miguelangel@nbee.es>

 * Copyright (C) 2012-2015 Jean-Pierre Charras, jaen-pierre.charras

 * Copyright (C) 2008-2015 Wayne Stambaugh <stambaughw@verizon.net>

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

pcbnew/modview_frame.cpp

+4 −4
Original line number Diff line number Diff line 
/*

 * 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 <stambaughw@verizon.net>

 * 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 <stambaughw@verizon.net>

 * 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: