diff --git a/eeschema/eeschema_id.h b/eeschema/eeschema_id.h index 8e3636b9ec..6574447e16 100644 --- a/eeschema/eeschema_id.h +++ b/eeschema/eeschema_id.h @@ -75,7 +75,6 @@ enum id_eeschema_frm /* Schematic editor veritcal toolbar IDs */ ID_SCHEMATIC_VERTICAL_TOOLBAR_START, ID_HIGHLIGHT, - ID_HIERARCHY_PUSH_POP_BUTT, ID_SCH_PLACE_COMPONENT, ID_PLACE_POWER_BUTT, ID_BUS_BUTT, diff --git a/eeschema/onleftclick.cpp b/eeschema/onleftclick.cpp index 2c40093a09..ae92c696bd 100644 --- a/eeschema/onleftclick.cpp +++ b/eeschema/onleftclick.cpp @@ -115,24 +115,6 @@ void SCH_EDIT_FRAME::OnLeftClick( wxDC* aDC, const wxPoint& aPosition ) HighlightConnectionAtPosition( aPosition ); break; - case ID_HIERARCHY_PUSH_POP_BUTT: - if( ( item && item->GetFlags() ) || ( g_RootSheet->CountSheets() == 0 ) ) - break; - - item = LocateAndShowItem( aPosition, SCH_COLLECTOR::SheetsOnly ); - - if( item ) // The user has clicked on a sheet: this is an enter sheet command - { - m_CurrentSheet->push_back( (SCH_SHEET*) item ); - DisplayCurrentSheet(); - } - else if( m_CurrentSheet->Last() != g_RootSheet ) - { // The user has clicked ouside a sheet:this is an leave sheet command - m_CurrentSheet->pop_back(); - DisplayCurrentSheet(); - } - break; - case ID_NOCONN_BUTT: if( ( item == NULL ) || ( item->GetFlags() == 0 ) ) { diff --git a/eeschema/schedit.cpp b/eeschema/schedit.cpp index 0eb51b9f21..b598187633 100644 --- a/eeschema/schedit.cpp +++ b/eeschema/schedit.cpp @@ -2,8 +2,8 @@ * 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) 2008-2013 Wayne Stambaugh - * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2008-2017 Wayne Stambaugh + * Copyright (C) 2004-2017 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 @@ -541,10 +541,6 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent ) SetNoToolSelected(); break; - case ID_HIERARCHY_PUSH_POP_BUTT: - SetToolID( id, wxCURSOR_HAND, _( "Descend or ascend hierarchy" ) ); - break; - case ID_NOCONN_BUTT: SetToolID( id, wxCURSOR_PENCIL, _( "Add no connect" ) ); break; diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index 78e0179308..bfa72bb56f 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2008-2011 Wayne Stambaugh + * Copyright (C) 2008-2017 Wayne Stambaugh * Copyright (C) 2004-2017 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or @@ -201,10 +201,6 @@ void SCH_EDIT_FRAME::ReCreateVToolbar() m_drawToolBar->AddTool( ID_HIGHLIGHT, wxEmptyString, KiBitmap( net_highlight_schematic_xpm ), _( "Highlight net" ), wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_HIERARCHY_PUSH_POP_BUTT, wxEmptyString, - KiBitmap( hierarchy_cursor_xpm ), - _( "Ascend/descend hierarchy" ), wxITEM_CHECK ); - m_drawToolBar->AddTool( ID_SCH_PLACE_COMPONENT, wxEmptyString, KiBitmap( add_component_xpm ), HELP_PLACE_COMPONENTS, wxITEM_CHECK );