From a1332d76fea25632d5ca136e9ec0b995bfe60cce Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Fri, 19 Jun 2020 14:09:54 +0100 Subject: [PATCH] Remove SHAPE_EDITOR frame types before we forget about them. They may go back at some point, or they may not.... --- common/kiway.cpp | 2 -- common/tool/common_tools.cpp | 1 - include/frame_type.h | 2 -- include/project.h | 2 -- 4 files changed, 7 deletions(-) diff --git a/common/kiway.cpp b/common/kiway.cpp index dddeb3c9b8..67868d747e 100644 --- a/common/kiway.cpp +++ b/common/kiway.cpp @@ -305,8 +305,6 @@ KIWAY::FACE_T KIWAY::KifaceType( FRAME_T aFrameType ) case FRAME_FOOTPRINT_VIEWER_MODAL: case FRAME_FOOTPRINT_WIZARD: case FRAME_PCB_DISPLAY3D: - case FRAME_SHAPE_EDITOR: - case FRAME_SHAPE_EDITOR_MODAL: return FACE_PCB; case FRAME_CVPCB: diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp index 9f61170a01..f8cb4d62ff 100644 --- a/common/tool/common_tools.cpp +++ b/common/tool/common_tools.cpp @@ -270,7 +270,6 @@ int COMMON_TOOLS::ZoomFitScreen( const TOOL_EVENT& aEvent ) // Leave a bigger margin for library editors & viewers if( frame->IsType( FRAME_FOOTPRINT_VIEWER ) || frame->IsType( FRAME_FOOTPRINT_VIEWER_MODAL ) - || frame->IsType( FRAME_SHAPE_EDITOR ) || frame->IsType( FRAME_SHAPE_EDITOR_MODAL ) || frame->IsType( FRAME_SCH_VIEWER ) || frame->IsType( FRAME_SCH_VIEWER_MODAL ) ) { margin_scale_factor = 1.4; diff --git a/include/frame_type.h b/include/frame_type.h index 05ad820fc8..d122b0f769 100644 --- a/include/frame_type.h +++ b/include/frame_type.h @@ -46,8 +46,6 @@ enum FRAME_T FRAME_FOOTPRINT_WIZARD, FRAME_PCB_DISPLAY3D, FRAME_FOOTPRINT_PREVIEW, - FRAME_SHAPE_EDITOR, - FRAME_SHAPE_EDITOR_MODAL, FRAME_CVPCB, FRAME_CVPCB_DISPLAY, diff --git a/include/project.h b/include/project.h index 09225dd168..2830a95c6b 100644 --- a/include/project.h +++ b/include/project.h @@ -189,8 +189,6 @@ public: PCB_FOOTPRINT_EDITOR_LIB_NICKNAME, PCB_FOOTPRINT_VIEWER_FP_NAME, PCB_FOOTPRINT_VIEWER_LIB_NICKNAME, - PCB_SHAPE_EDITOR_SHAPE_NAME, - PCB_SHAPE_EDITOR_LIB_NICKNAME, RSTRING_COUNT };