|
From: <sdo...@us...> - 2008-08-24 10:33:03
|
Revision: 5852
http://winmerge.svn.sourceforge.net/winmerge/?rev=5852&view=rev
Author: sdottaka
Date: 2008-08-24 10:33:01 +0000 (Sun, 24 Aug 2008)
Log Message:
-----------
PATCH: [ 2034259 ] Include unique folder contents to recursive compare (2)
- Although unchecking 'Include Subfolders' checkbox, DirScan_GetItems() scanned inside unique folders.
Modified Paths:
--------------
trunk/Src/DirScan.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/DirScan.cpp
===================================================================
--- trunk/Src/DirScan.cpp 2008-08-24 09:57:29 UTC (rev 5851)
+++ trunk/Src/DirScan.cpp 2008-08-24 10:33:01 UTC (rev 5852)
@@ -144,7 +144,7 @@
if (i<leftDirs.size() && (j == rightDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)<0))
{
UINT nDiffCode = DIFFCODE::LEFT | DIFFCODE::DIR;
- if (bUniques)
+ if (depth && bUniques)
{
// Recurse into unique subfolder and get all items in it
String leftnewsub = leftsubprefix + leftDirs[i].filename;
@@ -174,7 +174,7 @@
if (j<rightDirs.size() && (i == leftDirs.size() || collstr(leftDirs[i].filename, rightDirs[j].filename, casesensitive)>0))
{
UINT nDiffCode = DIFFCODE::RIGHT | DIFFCODE::DIR;
- if (bUniques)
+ if (depth && bUniques)
{
// Recurse into unique subfolder and get all items in it
String rightnewsub = rightsubprefix + rightDirs[j].filename;
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2008-08-24 09:57:29 UTC (rev 5851)
+++ trunk/Src/StdAfx.h 2008-08-24 10:33:01 UTC (rev 5852)
@@ -13,6 +13,18 @@
#if !defined(AFX_STDAFX_H__BBCD4F8A_34E4_11D1_BAA6_00A024706EDC__INCLUDED_)
#define AFX_STDAFX_H__BBCD4F8A_34E4_11D1_BAA6_00A024706EDC__INCLUDED_
+#if _MSC_VER >= 1500
+#if defined _M_IX86
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_IA64
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#elif defined _M_X64
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#else
+#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#endif
+#endif
+
// Set WINVER for VC6, VS2005 and VS2008
//On VS2003 default is set to 0x0501 (Windows XP and Windows .NET Server)
//On VS2005 default is set to 0x0502 (Windows Server 2003)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
