[Winmerge-svn] SF.net SVN: winmerge: [4309] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ga...@us...> - 2007-06-01 05:26:35
|
Revision: 4309 http://svn.sourceforge.net/winmerge/?rev=4309&view=rev Author: galh Date: 2007-05-31 22:26:33 -0700 (Thu, 31 May 2007) Log Message: ----------- BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/DirView.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2007-05-31 22:06:45 UTC (rev 4308) +++ trunk/Src/Changes.txt 2007-06-01 05:26:33 UTC (rev 4309) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-06-01 Gal + BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge + Src: DirView.cpp + 2007-05-31 Tim PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase" Src: Merge.rc Modified: trunk/Src/DirView.cpp =================================================================== --- trunk/Src/DirView.cpp 2007-05-31 22:06:45 UTC (rev 4308) +++ trunk/Src/DirView.cpp 2007-06-01 05:26:33 UTC (rev 4309) @@ -2055,6 +2055,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. |