diff --git a/eeschema/libeditframe.cpp b/eeschema/libeditframe.cpp index 299c9d2975..1022a4507f 100644 --- a/eeschema/libeditframe.cpp +++ b/eeschema/libeditframe.cpp @@ -713,6 +713,7 @@ void LIB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) { int id = event.GetId(); wxPoint pos; + SCH_SCREEN* screen = GetScreen(); m_canvas->SetIgnoreMouseEvents( true ); @@ -887,48 +888,48 @@ void LIB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_ZOOM_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_ZOOM ); + screen->m_BlockLocate.SetCommand( BLOCK_ZOOM ); HandleBlockEnd( &dc ); break; case ID_POPUP_DELETE_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_DELETE ); + screen->m_BlockLocate.SetCommand( BLOCK_DELETE ); m_canvas->MoveCursorToCrossHair(); HandleBlockEnd( &dc ); break; case ID_POPUP_DUPLICATE_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_DUPLICATE ); + screen->m_BlockLocate.SetCommand( BLOCK_DUPLICATE ); m_canvas->MoveCursorToCrossHair(); HandleBlockEnd( &dc ); break; case ID_POPUP_SELECT_ITEMS_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_SELECT_ITEMS_ONLY ); + screen->m_BlockLocate.SetCommand( BLOCK_SELECT_ITEMS_ONLY ); m_canvas->MoveCursorToCrossHair(); HandleBlockEnd( &dc ); break; case ID_POPUP_MIRROR_Y_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_MIRROR_Y ); + screen->m_BlockLocate.SetCommand( BLOCK_MIRROR_Y ); m_canvas->MoveCursorToCrossHair(); HandleBlockPlace( &dc ); break; case ID_POPUP_MIRROR_X_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_MIRROR_X ); + screen->m_BlockLocate.SetCommand( BLOCK_MIRROR_X ); m_canvas->MoveCursorToCrossHair(); HandleBlockPlace( &dc ); break; case ID_POPUP_ROTATE_BLOCK: m_canvas->SetAutoPanRequest( false ); - GetScreen()->m_BlockLocate.SetCommand( BLOCK_ROTATE ); + screen->m_BlockLocate.SetCommand( BLOCK_ROTATE ); m_canvas->MoveCursorToCrossHair(); HandleBlockPlace( &dc ); break;