From f2e6170fbc02a0799d13a7ddf11d53d85a0ca925 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 29 Apr 2011 10:17:14 +0200
Subject: [PATCH] Eeschema: bug fix: after a "De Morgan" convert command, the
 component was left selected (.m_Flags not cleared)

---
 common/build_version.cpp           | 2 +-
 eeschema/getpart.cpp               | 6 ++++--
 packaging/windows/nsis/install.nsi | 2 +-
 version.txt                        | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/common/build_version.cpp b/common/build_version.cpp
index 876120a7df..3949755361 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2011-04-24)"
+#define KICAD_BUILD_VERSION "(2011-04-28)"
 #endif
 
 
diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp
index 8ac99032d9..271872d3fb 100644
--- a/eeschema/getpart.cpp
+++ b/eeschema/getpart.cpp
@@ -257,8 +257,6 @@ SCH_COMPONENT* SCH_EDIT_FRAME::Load_Component( wxDC*           DC,
 
 /*
  * Routine to rotate and mirror a component.
- *
- ** If DC == NULL: no repaint
  */
 void SCH_EDIT_FRAME::OnChangeComponentOrientation( wxCommandEvent& aEvent )
 {
@@ -409,6 +407,7 @@ void SCH_EDIT_FRAME::ConvertPart( SCH_COMPONENT* DrawComponent, wxDC* DC )
         return;
     }
 
+    int flags = DrawComponent->m_Flags;
     if( DrawComponent->m_Flags )
         DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode, g_GhostColor );
     else
@@ -425,6 +424,9 @@ void SCH_EDIT_FRAME::ConvertPart( SCH_COMPONENT* DrawComponent, wxDC* DC )
     if( DrawComponent->GetConvert() > 2 )
         DrawComponent->SetConvert( 1 );
 
+    DrawComponent->ClearFlags();
+    DrawComponent->SetFlags( flags );   // Restore m_Flag (modified by SetConvert())
+
     /* Redraw the component in the new position. */
     if( DrawComponent->m_Flags & IS_MOVED )
         DrawComponent->Draw( DrawPanel, DC, wxPoint( 0, 0 ), g_XorMode, g_GhostColor );
diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi
index e57e7073d1..99d19061f4 100644
--- a/packaging/windows/nsis/install.nsi
+++ b/packaging/windows/nsis/install.nsi
@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.04.24"
+!define PRODUCT_VERSION "2011.04.28"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""
diff --git a/version.txt b/version.txt
index d8eaea9ec3..73594abe4d 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 release version:
-2011 apr 24
+2011 apr 28
 files (.zip,.tgz):
-kicad-2011-04-24
+kicad-2011-04-28