Commit 97749ed1 authored by jean-pierre charras's avatar jean-pierre charras

Eeschema: fix bug 1092864

parent d919d710
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 jean-pierre.charras * Copyright (C) 2012 jean-pierre.charras
* Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 2012 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -27,20 +27,12 @@ ...@@ -27,20 +27,12 @@
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <gr_basic.h>
#include <macros.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <trigo.h>
#include <richio.h>
#include <plot_common.h>
#include <wxEeschemaStruct.h> #include <wxEeschemaStruct.h>
#include <general.h>
#include <sch_bitmap.h> #include <sch_bitmap.h>
#include <dialog_image_editor.h> #include <dialog_image_editor.h>
#include <algorithm>
static void abortMoveBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC ) static void abortMoveBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
{ {
...@@ -70,7 +62,8 @@ static void abortMoveBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC ) ...@@ -70,7 +62,8 @@ static void abortMoveBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC )
// Never delete existing item, because it can be referenced by an undo/redo command // Never delete existing item, because it can be referenced by an undo/redo command
// Just restore its data // Just restore its data
swap( *item, *olditem ); item->SwapData( olditem );
parent->SetUndoItem( NULL );
} }
screen->SetCurItem( item ); screen->SetCurItem( item );
......
...@@ -27,19 +27,11 @@ ...@@ -27,19 +27,11 @@
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <gr_basic.h>
#include <macros.h>
#include <class_drawpanel.h> #include <class_drawpanel.h>
#include <trigo.h> #include <trigo.h>
#include <richio.h>
#include <plot_common.h>
#include <wxEeschemaStruct.h> #include <wxEeschemaStruct.h>
#include <general.h>
#include <sch_bitmap.h> #include <sch_bitmap.h>
#include <protos.h>
#include <wx/mstream.h> #include <wx/mstream.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment