[Winmerge-svn] SF.net SVN: winmerge:[5710] trunk

[<ki...@us...>]

Revision: 5710
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5710&view=rev
Author:   kimmov
Date:     2008-07-31 11:39:05 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
BUG: [ 2025130 ] Line Filters behave wonky

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/LineFiltersDlg.cpp
    trunk/Src/LineFiltersDlg.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-07-31 11:25:54 UTC (rev 5709)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-31 11:39:05 UTC (rev 5710)
@@ -11,6 +11,7 @@
   Improve tree mode in folder compare (#2018836)
   BugFix: Could change syntax highlight mode when highlighting was
     disabled from options (#2027325)
+  BugFix: Editing line filters updated wrong filter (#2025130)
 
 WinMerge 2.11.1.2 - 2008-07-24 (r5673)
   Refresh compare after changing filter (#2017426)

Modified: trunk/Src/LineFiltersDlg.cpp
===================================================================
--- trunk/Src/LineFiltersDlg.cpp	2008-07-31 11:25:54 UTC (rev 5709)
+++ trunk/Src/LineFiltersDlg.cpp	2008-07-31 11:39:05 UTC (rev 5710)
@@ -34,6 +34,7 @@
 : CPropertyPage(LineFiltersDlg::IDD)
 , m_pList(NULL)
 , m_bEditing(FALSE)
+, m_editedIndex(-1)
 {
 	//{{AFX_DATA_INIT(LineFiltersDlg)
 	m_bIgnoreRegExp = FALSE;
@@ -168,12 +169,6 @@
 	sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
 	if (sel > -1)
 	{
-/*		CEdit * pEdit = m_filtersList.EditLabel(sel);
-		if (pEdit)
-		{
-			pEdit->SetFocus();
-		}
-*/
 		CString text = m_filtersList.GetItemText(sel, 0);
 		m_editRegexp.SetWindowText(text);
 		m_editRegexp.SetReadOnly(FALSE);
@@ -181,6 +176,7 @@
 		m_editRegexp.SetFocus();
 		m_editRegexp.SetSel(0, -1);
 		m_bEditing = TRUE;
+		m_editedIndex = sel;
 	}
 }
 
@@ -308,17 +304,13 @@
 {
 	if (m_bEditing)
 	{
-		int sel =- 1;
-		sel = m_filtersList.GetNextItem(sel, LVNI_SELECTED);
-		if (sel != -1)
-		{
-			CString text;
-			m_editRegexp.GetWindowText(text);
-			m_filtersList.SetItemText(sel, 0, text);
-		}
+		CString text;
+		m_editRegexp.GetWindowText(text);
+		m_filtersList.SetItemText(m_editedIndex, 0, text);
 		m_bEditing = FALSE;
 		m_editRegexp.SetReadOnly(TRUE);
 		m_saveRegexp.EnableWindow(FALSE);
+		m_editedIndex = -1;
 	}
 }
 

Modified: trunk/Src/LineFiltersDlg.h
===================================================================
--- trunk/Src/LineFiltersDlg.h	2008-07-31 11:25:54 UTC (rev 5709)
+++ trunk/Src/LineFiltersDlg.h	2008-07-31 11:39:05 UTC (rev 5710)
@@ -71,6 +71,7 @@
 
 	LineFiltersList * m_pList; /**< Helper list for getting/setting filters. */
 	BOOL m_bEditing; /**< Are we editing a filter string? */
+	int m_editedIndex; /**< Index of the item being edited. */
 };
 
 //{{AFX_INSERT_LOCATION}}


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