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

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

Revision: 4335
          http://svn.sourceforge.net/winmerge/?rev=4335&view=rev
Author:   kimmov
Date:     2007-06-14 12:51:35 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
PATCH: [ 1727878 ] 26Branch: Disable hiding folder compare confirmation dialogs

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

Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt	2007-06-14 19:26:30 UTC (rev 4334)
+++ branches/R2_6/Src/Changes.txt	2007-06-14 19:51:35 UTC (rev 4335)
@@ -7,6 +7,8 @@
   ShellExtension: ShellExtension.rc
  PATCH: [ 1735240 ] Copy new Delphi- and Symbian -file filters to 2.6 branch
   Filters new files: Delphi.flt Symbian.flt
+ PATCH: [ 1727878 ] 26Branch: Disable hiding folder compare confirmation dialogs
+  Src: DirActions.cpp
 
 2007-06-07 Kimmo
  PATCH: [ 1721815 ] Add CSharp file filter for 2.6.x

Modified: branches/R2_6/Src/DirActions.cpp
===================================================================
--- branches/R2_6/Src/DirActions.cpp	2007-06-14 19:26:30 UTC (rev 4334)
+++ branches/R2_6/Src/DirActions.cpp	2007-06-14 19:51:35 UTC (rev 4335)
@@ -48,7 +48,7 @@
 	CString s;
 	ASSERT(count>1);
 	AfxFormatString2(s, IDS_CONFIRM_COPY2DIR, NumToStr(count), NumToStr(total));
-	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY2DIR);
+	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
 	return (rtn==IDYES);
 }
 
@@ -57,7 +57,7 @@
 {
 	CString s;
 	AfxFormatString2(s, IDS_CONFIRM_COPY_SINGLE, src, dest);
-	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_COPY_SINGLE);
+	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
 	return (rtn==IDYES);
 }
 
@@ -66,7 +66,7 @@
 {
 	CString s;
 	AfxFormatString2(s, IDS_CONFIRM_DELETE_ITEMS, NumToStr(count), NumToStr(total));
-	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_ITEMS);
+	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
 	return (rtn==IDYES);
 }
 
@@ -75,7 +75,7 @@
 {
 	CString s;
 	AfxFormatString1(s, IDS_CONFIRM_DELETE_SINGLE, filepath);
-	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_CONFIRM_DELETE_SINGLE);
+	int rtn = AfxMessageBox(s, MB_YESNO | MB_ICONWARNING);
 	return (rtn==IDYES);
 }
 


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