haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eeschema: fix bug 1092864

This commit is contained in:
jean-pierre charras 2012-12-21 19:57:56 +01:00
parent d919d71054
commit 97749ed192
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/edit_bitmap.cpp
View File

@ -1,8 +1,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2012 jean-pierre.charras
* Copyright (C) 2012 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
@ -27,20 +27,12 @@
*/
#include <fctsys.h>
#include <gr_basic.h>
#include <macros.h>
#include <class_drawpanel.h>
#include <trigo.h>
#include <richio.h>
#include <plot_common.h>
#include <wxEeschemaStruct.h>
#include <general.h>
#include <sch_bitmap.h>
#include <dialog_image_editor.h>
#include <algorithm>
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
// Just restore its data
swap( *item, *olditem );
item->SwapData( olditem );
parent->SetUndoItem( NULL );
}
screen->SetCurItem( item );

8
eeschema/sch_bitmap.cpp
View File

@ -27,19 +27,11 @@
*/
#include <fctsys.h>
#include <gr_basic.h>
#include <macros.h>
#include <class_drawpanel.h>
#include <trigo.h>
#include <richio.h>
#include <plot_common.h>
#include <wxEeschemaStruct.h>
#include <general.h>
#include <sch_bitmap.h>
#include <protos.h>
#include <wx/mstream.h>