From: Dennis Lim <dlkj@users.sourceforge.net>
Date: Thu, 15 Nov 2001 14:07:29 +0000 (+0000)
Subject: add 'extensions' column in directory diff
X-Git-Tag: 2.16.5~8220
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5d47bfa8d04e508eb2438ff84f24b45b13acfe6;p=winmerge-jp%2Fwinmerge-jp.git

add 'extensions' column in directory diff
---

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index eb870d06e..1a766d854 100644
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -19,6 +19,7 @@ struct dirdata
 
 typedef struct tagDIFFITEM {
 	TCHAR filename[_MAX_FNAME+_MAX_EXT];
+	TCHAR extension[_MAX_EXT];
 	TCHAR lpath[MAX_PATH], rpath[MAX_PATH];
 	long ltime, rtime;
 	BYTE code;
diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index 503408b0a..520caf751 100644
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -229,6 +229,7 @@ void CDirDoc::Redisplay()
 				&& (!mf->m_bHideBak || !FileExtMatches(di.filename,BACKUP_FILE_EXT)))
 			{
 				m_pView->AddItem(cnt, DV_NAME, di.filename);
+				m_pView->AddItem(cnt, DV_EXT, di.extension);    // BSP - Add the current file extension
 
 				p = _tcsninc(di.lpath, llen);
 				s = _T(".");
@@ -245,6 +246,7 @@ void CDirDoc::Redisplay()
 				&& (!mf->m_bHideBak || !FileExtMatches(di.filename,BACKUP_FILE_EXT)))
 			{
 				m_pView->AddItem(cnt, DV_NAME, di.filename);
+				m_pView->AddItem(cnt, DV_EXT, di.extension);    // BSP - Add the current file extension
 				p = _tcsninc(di.lpath, llen);
 				s = _T(".");
 				s += p;
@@ -262,6 +264,7 @@ void CDirDoc::Redisplay()
 				&& (!mf->m_bHideBak || !FileExtMatches(di.filename,BACKUP_FILE_EXT)))
 			{
 				m_pView->AddItem(cnt, DV_NAME, di.filename);
+				m_pView->AddItem(cnt, DV_EXT, di.extension);    // BSP - Add the current file extension
 				
 				if (di.code==FILE_LUNIQUE || di.code==FILE_LDIRUNIQUE)
 					p = _tcsninc(di.lpath, llen);
@@ -280,6 +283,7 @@ void CDirDoc::Redisplay()
 				&& (!mf->m_bHideBak || !FileExtMatches(di.filename,BACKUP_FILE_EXT)))
 			{
 				m_pView->AddItem(cnt, DV_NAME, di.filename);
+				m_pView->AddItem(cnt, DV_EXT, di.extension);    // BSP - Add the current file extension
 				p = _tcsninc(di.lpath, llen);
 				s = _T(".");
 				s += p;
@@ -291,6 +295,7 @@ void CDirDoc::Redisplay()
 			break;
 		default: // error
 			m_pView->AddItem(cnt, DV_NAME, di.filename);
+			m_pView->AddItem(cnt, DV_EXT, di.extension); // BSP - Add the current file extension
 			p = _tcsninc(di.lpath, llen);
 			s = _T(".");
 			s += p;