[Winmerge-svn] SF.net SVN: winmerge: [4340] branches/R2_6/Src

[<ga...@us...>]

Revision: 4340
          http://svn.sourceforge.net/winmerge/?rev=4340&view=rev
Author:   galh
Date:     2007-06-17 00:06:31 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge

Modified Paths:
--------------
    branches/R2_6/Src/Changes.txt
    branches/R2_6/Src/DirView.cpp

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-06-16 05:43:41 UTC (rev 4339)
+++ branches/R2_6/Src/Changes.txt	2007-06-17 07:06:31 UTC (rev 4340)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2007-06-17 Gal
+ BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
+  Src: DirView.cpp
+
 2007-06-16 Jochen
  PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output
   Src: 7zCommon.cpp

Modified: branches/R2_6/Src/DirView.cpp
===================================================================
--- branches/R2_6/Src/DirView.cpp	2007-06-16 05:43:41 UTC (rev 4339)
+++ branches/R2_6/Src/DirView.cpp	2007-06-17 07:06:31 UTC (rev 4340)
@@ -1978,6 +1978,14 @@
 			if (TRUE == IsLabelEdit())
 			{
 				m_bUserCancelEdit = TRUE;
+
+				// The edit control send LVN_ENDLABELEDIT when it loses focus,
+				// so we use it to cancel the rename action.
+				m_pList->SetFocus();
+
+				// Stop the ESC before it reach the main frame which might
+				// cause a program termination.
+				return TRUE;
 			}
 			else if (m_bEscCloses)
 			{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.