You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2006-10-31 17:34:03
|
Revision: 3748
http://svn.sourceforge.net/winmerge/?rev=3748&view=rev
Author: kimmov
Date: 2006-10-31 09:33:53 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
PATCH: [ 1578494 ] 26Branch: Optimize binary files compare
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/DiffFileData.cpp
branches/R2_6/Src/DiffItem.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-31 16:52:47 UTC (rev 3747)
+++ branches/R2_6/Src/Changes.txt 2006-10-31 17:33:53 UTC (rev 3748)
@@ -7,6 +7,8 @@
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
Src/Common: PreferencesDlg.cpp
+ PATCH: [ 1578494 ] 26Branch: Optimize binary files compare
+ Src: DiffFileData.cpp DiffItem.h
2006-10-29 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified: branches/R2_6/Src/DiffFileData.cpp
===================================================================
--- branches/R2_6/Src/DiffFileData.cpp 2006-10-31 16:52:47 UTC (rev 3747)
+++ branches/R2_6/Src/DiffFileData.cpp 2006-10-31 17:33:53 UTC (rev 3748)
@@ -209,11 +209,10 @@
int DiffFileData::diffutils_compare_files(int depth)
{
int bin_flag = 0;
- int bin_file = 0; // bitmap for binary files
// Do the actual comparison (generating a change script)
struct change *script = NULL;
- BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, &bin_file);
+ BOOL success = Diff2Files(&script, depth, &bin_flag, FALSE, NULL);
if (!success)
{
return DIFFCODE::FILE | DIFFCODE::TEXT | DIFFCODE::CMPERR;
@@ -250,18 +249,7 @@
// Clear text-flag, set binary flag
// We don't know diff counts for binary files
code = code & ~DIFFCODE::TEXT;
- switch (bin_file)
- {
- case BINFILE_SIDE1: code |= DIFFCODE::BINSIDE1;
- break;
- case BINFILE_SIDE2: code |= DIFFCODE::BINSIDE2;
- break;
- case BINFILE_SIDE1 | BINFILE_SIDE2: code |= DIFFCODE::BIN;
- break;
- default:
- _RPTF1(_CRT_ERROR, "Invalid bin_file value: %d", bin_file);
- break;
- }
+ code |= DIFFCODE::BIN;
m_ndiffs = DiffFileData::DIFFS_UNKNOWN;
}
@@ -694,16 +682,11 @@
// did we finish both files?
if (eof[0] && eof[1])
{
-
BOOL bBin0 = (m_textStats0.nzeros>0);
BOOL bBin1 = (m_textStats1.nzeros>0);
- if (bBin0 && bBin1)
+ if (bBin0 || bBin1)
diffcode |= DIFFCODE::BIN;
- else if (bBin0)
- diffcode |= DIFFCODE::BINSIDE1;
- else if (bBin1)
- diffcode |= DIFFCODE::BINSIDE2;
// If either unfinished, they differ
if (ptr0 != end0 || ptr1 != end1)
Modified: branches/R2_6/Src/DiffItem.h
===================================================================
--- branches/R2_6/Src/DiffItem.h 2006-10-31 16:52:47 UTC (rev 3747)
+++ branches/R2_6/Src/DiffItem.h 2006-10-31 17:33:53 UTC (rev 3748)
@@ -54,7 +54,7 @@
// and each set of flags is in a different hex digit
// to make debugging easier
// These can always be packed down in the future
- TEXTFLAGS=0x7, TEXT=0x1, BINSIDE1=0x2, BINSIDE2=0x3, BIN=0x4,
+ TEXTFLAGS=0x7, TEXT=0x1, BIN=0x2,
DIRFLAGS=0x30, FILE=0x10, DIR=0x20,
SIDEFLAGS=0x300, LEFT=0x100, RIGHT=0x200, BOTH=0x300,
COMPAREFLAGS=0x7000, NOCMP=0x0000, SAME=0x1000, DIFF=0x2000, CMPERR=0x3000, CMPABORT=0x4000,
@@ -99,9 +99,7 @@
// filter status
bool isResultFiltered() const { return CheckFilter(diffcode, DIFFCODE::SKIPPED); }
// type
- bool isBin() const { return Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BIN) ||
- Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BINSIDE1) ||
- Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BINSIDE2); }
+ bool isBin() const { return Check(diffcode, DIFFCODE::TEXTFLAGS, DIFFCODE::BIN); }
void setBin() { Set(DIFFCODE::TEXTFLAGS, DIFFCODE::BIN); }
// rescan
bool isScanNeeded() const { return ((diffcode & DIFFCODE::SCANFLAGS) == DIFFCODE::NEEDSCAN); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-31 16:53:09
|
Revision: 3747
http://svn.sourceforge.net/winmerge/?rev=3747&view=rev
Author: kimmov
Date: 2006-10-31 08:52:47 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
PATCH: [ 1586869 ] Fix File Select -dialog modality
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Common/PreferencesDlg.cpp
branches/R2_6/Src/DirCmpReportDlg.cpp
branches/R2_6/Src/FileFiltersDlg.cpp
branches/R2_6/Src/MainFrm.cpp
branches/R2_6/Src/Merge.cpp
branches/R2_6/Src/Merge.h
branches/R2_6/Src/MergeDoc.cpp
branches/R2_6/Src/PatchDlg.cpp
branches/R2_6/Src/ProjectFilePathsDlg.cpp
branches/R2_6/Src/PropRegistry.cpp
branches/R2_6/Src/PropVss.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/Changes.txt 2006-10-31 16:52:47 UTC (rev 3747)
@@ -2,6 +2,12 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-31 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality
+ Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
+ MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+ Src/Common: PreferencesDlg.cpp
+
2006-10-29 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Src: MainFrm.cpp MainFrm.h
Modified: branches/R2_6/Src/Common/PreferencesDlg.cpp
===================================================================
--- branches/R2_6/Src/Common/PreferencesDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/Common/PreferencesDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -296,7 +296,7 @@
CString s;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_IMPORT_CAPTION));
- if (SelectFile(s, NULL, caption, IDS_INIFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, NULL, caption, IDS_INIFILES, TRUE))
{
if (m_pOptionsMgr->ImportOptions(s) == OPT_OK)
{
@@ -316,7 +316,7 @@
CString settingsFile;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_EXPORT_CAPTION));
- if (SelectFile(settingsFile, NULL, caption, IDS_INIFILES, FALSE))
+ if (SelectFile(GetSafeHwnd(), settingsFile, NULL, caption, IDS_INIFILES, FALSE))
{
// Add settings file extension if it is missing
// So we allow 'filename.otherext' but add extension for 'filename'
Modified: branches/R2_6/Src/DirCmpReportDlg.cpp
===================================================================
--- branches/R2_6/Src/DirCmpReportDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/DirCmpReportDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -118,7 +118,8 @@
int filterid = f_types[m_ctlStyle.GetCurSel()].browseFilter;
CString chosenFilepath;
- if (SelectFile(chosenFilepath, folder, title, filterid, FALSE))
+ if (SelectFile(GetSafeHwnd(), chosenFilepath, folder, title,
+ filterid, FALSE))
{
CString name;
SplitFilename(chosenFilepath, &folder, &name, NULL);
Modified: branches/R2_6/Src/FileFiltersDlg.cpp
===================================================================
--- branches/R2_6/Src/FileFiltersDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/FileFiltersDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -408,7 +408,8 @@
path += '\\';
CString s;
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ FALSE))
{
// Fix file extension
TCHAR file[_MAX_FNAME] = {0};
@@ -537,7 +538,8 @@
CString userPath = theApp.m_globalFileFilter.GetUserFilterPathWithCreate();
CString title = LoadResString(IDS_FILEFILTER_INSTALL);
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ TRUE))
{
CString filename, ext;
SplitFilename(s, NULL, &filename, &ext);
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/MainFrm.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -896,7 +896,7 @@
if (!bMultiFile)
{
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
- if (SelectFile(s, strSavePath, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, strSavePath, title, NULL, FALSE))
{
strSavePath = s;
nRetVal = IDNO;
@@ -2722,7 +2722,8 @@
// get the default projects path
CString strProjectPath = m_options.GetString(OPT_PROJECTS_PATH);
- if (!SelectFile(sFilepath, strProjectPath, title, IDS_PROJECTFILES, TRUE))
+ if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath, title, IDS_PROJECTFILES,
+ TRUE))
return;
strProjectPath = paths_GetParentPath(sFilepath);
Modified: branches/R2_6/Src/Merge.cpp
===================================================================
--- branches/R2_6/Src/Merge.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/Merge.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -364,18 +364,18 @@
/**
* @brief Helper function for selecting dir/file
+ * @param [in] parent Handle to parent window. Can be a NULL, but then
+ * CMainFrame is used which can cause modality problems.
* @param [out] path Selected path is returned in this string
* @param [in] initialPath Initial path (and file) shown when dialog is opened
* @param [in] title Title for path selection dialog
- * @param [in] filterid 0 or STRING ID for filter string - 0 means "All files (*.*)"
+ * @param [in] filterid 0 or STRING ID for filter string
+ * - 0 means "All files (*.*)"
* @param [in] is_open Selects Open/Save -dialog
*/
-BOOL SelectFile(
- CString& path,
- LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/,
- UINT filterid /*=0*/,
- BOOL is_open /*=TRUE*/)
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
+ LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
+ BOOL is_open /*=TRUE*/)
{
path.Empty(); // Clear output param
@@ -394,20 +394,24 @@
SplitFilename(initialPath, 0, &sSelectedFile, 0);
}
}
+
+ if (parent == NULL)
+ parent = AfxGetMainWnd()->GetSafeHwnd();
if (!filterid)
filterid = IDS_ALLFILES;
- CString filters;
- VERIFY(filters.LoadString(filterid));
+ CString filters = LoadResString(filterid);
+
// Convert extension mask from MFC style separators ('|')
// to Win32 style separators ('\0')
LPTSTR filtersStr = filters.GetBuffer(0);
ConvertFilter(filtersStr);
+ filters.ReleaseBuffer();
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
+ ofn.hwndOwner = parent;
ofn.lpstrFilter = filtersStr;
ofn.lpstrCustomFilter = NULL;
ofn.nFilterIndex = 1;
Modified: branches/R2_6/Src/Merge.h
===================================================================
--- branches/R2_6/Src/Merge.h 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/Merge.h 2006-10-31 16:52:47 UTC (rev 3747)
@@ -119,9 +119,8 @@
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
-BOOL SelectFile(CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = _T("Open"),
- UINT filterid =0,
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
+ LPCTSTR title = _T("Open"), UINT filterid = 0,
BOOL is_open =TRUE);
BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
Modified: branches/R2_6/Src/MergeDoc.cpp
===================================================================
--- branches/R2_6/Src/MergeDoc.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/MergeDoc.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -982,6 +982,8 @@
CString title;
BOOL result = TRUE;
int answer = IDOK; // Set default we use for scratchpads
+ int nActiveViewIndexType = GetActiveMergeViewIndexType();
+ HWND parent = m_pView[nActiveViewIndexType]->GetSafeHwnd();
// We shouldn't get here if saving is succeed before
ASSERT(nSaveResult != SAVE_DONE);
@@ -1012,7 +1014,7 @@
else
VERIFY(title.LoadString(IDS_SAVE_RIGHT_AS));
- if (SelectFile(s, strPath, title, NULL, FALSE))
+ if (SelectFile(parent, s, strPath, title, NULL, FALSE))
{
CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer];
strSavePath = s;
Modified: branches/R2_6/Src/PatchDlg.cpp
===================================================================
--- branches/R2_6/Src/PatchDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/PatchDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -257,7 +257,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file1;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, TRUE);
m_ctlFile1.SetWindowText(s);
@@ -276,7 +276,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file2;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, FALSE);
m_ctlFile2.SetWindowText(s);
@@ -334,7 +334,7 @@
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
folder = m_fileResult;
- if (SelectFile(s, folder, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, FALSE))
{
SplitFilename(s, &folder, &name, NULL);
m_fileResult = s;
Modified: branches/R2_6/Src/ProjectFilePathsDlg.cpp
===================================================================
--- branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -73,7 +73,8 @@
void ProjectFilePathsDlg::OnBnClickedProjLfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sLeftFile, m_sLeftFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sLeftFile, m_sLeftFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -83,7 +84,8 @@
void ProjectFilePathsDlg::OnBnClickedProjRfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sRightFile, m_sRightFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sRightFile, m_sRightFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -227,7 +229,8 @@
CString strProjectFileName;
CString strProjectPath = GetOptionsMgr()->GetString(OPT_PROJECTS_PATH);
- if (!::SelectFile(strProjectFileName, strProjectPath, NULL, IDS_PROJECTFILES, bOpen))
+ if (!::SelectFile(GetSafeHwnd(), strProjectFileName, strProjectPath, NULL,
+ IDS_PROJECTFILES, bOpen))
return _T("");
if (strProjectFileName.IsEmpty())
Modified: branches/R2_6/Src/PropRegistry.cpp
===================================================================
--- branches/R2_6/Src/PropRegistry.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/PropRegistry.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -237,7 +237,7 @@
CString title;
VERIFY(title.LoadString(IDS_OPEN_TITLE));
- if (SelectFile(path, NULL, title, IDS_PROGRAMFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), path, NULL, title, IDS_PROGRAMFILES, TRUE))
{
m_strEditorPath = path;
UpdateData(FALSE);
Modified: branches/R2_6/Src/PropVss.cpp
===================================================================
--- branches/R2_6/Src/PropVss.cpp 2006-10-31 16:48:54 UTC (rev 3746)
+++ branches/R2_6/Src/PropVss.cpp 2006-10-31 16:52:47 UTC (rev 3747)
@@ -91,7 +91,7 @@
void CPropVss::OnBrowseButton()
{
CString s;
- if (SelectFile(s))
+ if (SelectFile(GetSafeHwnd(), s))
{
m_strPath = s;
m_ctlPath.SetWindowText(s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-31 16:49:10
|
Revision: 3746
http://svn.sourceforge.net/winmerge/?rev=3746&view=rev
Author: kimmov
Date: 2006-10-31 08:48:54 -0800 (Tue, 31 Oct 2006)
Log Message:
-----------
PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Common/PreferencesDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-31 00:14:57 UTC (rev 3745)
+++ trunk/Src/Changes.txt 2006-10-31 16:48:54 UTC (rev 3746)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-31 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
+ Src/Common: PreferencesDlg.cpp
+
2006-10-30 Kimmo
PATCH: [ 1586869 ] Fix File Select -dialog modality
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
Modified: trunk/Src/Common/PreferencesDlg.cpp
===================================================================
--- trunk/Src/Common/PreferencesDlg.cpp 2006-10-31 00:14:57 UTC (rev 3745)
+++ trunk/Src/Common/PreferencesDlg.cpp 2006-10-31 16:48:54 UTC (rev 3746)
@@ -296,7 +296,7 @@
CString s;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_IMPORT_CAPTION));
- if (SelectFile(s, NULL, caption, IDS_INIFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, NULL, caption, IDS_INIFILES, TRUE))
{
if (m_pOptionsMgr->ImportOptions(s) == OPT_OK)
{
@@ -316,7 +316,8 @@
CString settingsFile;
CString caption;
VERIFY(caption.LoadString(IDS_OPT_EXPORT_CAPTION));
- if (SelectFile(settingsFile, NULL, caption, IDS_INIFILES, FALSE))
+ if (SelectFile(GetSafeHwnd(), settingsFile, NULL, caption, IDS_INIFILES,
+ FALSE))
{
// Add settings file extension if it is missing
// So we allow 'filename.otherext' but add extension for 'filename'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-31 00:15:15
|
Revision: 3745
http://svn.sourceforge.net/winmerge/?rev=3745&view=rev
Author: kimmov
Date: 2006-10-30 16:14:57 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Cleanup example test, add more simple string compare tests
Modified Paths:
--------------
trunk/Testing/CppUnit/Changes.txt
trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp
trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp
trunk/Testing/CppUnit/StringDifferencing/TestCase1.h
Added Paths:
-----------
trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.cpp
trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.h
trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.cpp
trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.h
Modified: trunk/Testing/CppUnit/Changes.txt
===================================================================
--- trunk/Testing/CppUnit/Changes.txt 2006-10-30 21:02:36 UTC (rev 3744)
+++ trunk/Testing/CppUnit/Changes.txt 2006-10-31 00:14:57 UTC (rev 3745)
@@ -1,5 +1,11 @@
Testing\selftest\Changes.txt
+2006-10-31 Kimmo
+ Cleanup example test, add more simple string compare tests
+ StringDifferencing: StringDifferencing.dsp TestCase1.cpp TestCase1.h
+ StringDifferencing: add files DifferentStrings1.cpp DifferentStrings1.h
+ IdenticalStrings1.cpp IdenticalStrings1.h
+
2006-10-27 Kimmo
PATCH: [ 1585418 ] CppUnit tests for StringDiff
Add folder Testing/CppUnit for unit tests
Added: trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.cpp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.cpp 2006-10-31 00:14:57 UTC (rev 3745)
@@ -0,0 +1,119 @@
+/**
+ * @file DifferentStrings1.h
+ *
+ * @brief Implementation for simple different strings tests.
+ */
+
+#include <cppunit/config/SourcePrefix.h>
+#include "stdafx.h"
+
+#include "CompareOptions.h"
+#include "stringdiffs.h"
+
+#include "DifferentStrings1.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( DifferentStrings1 );
+
+/** @brief Testcase initialization code. */
+void DifferentStrings1::setUp()
+{
+ // Add possible initializations here
+}
+
+/** @brief Testcase cleanup code. */
+void DifferentStrings1::tearDown()
+{
+ // Add possible cleanups here
+}
+
+/**
+ * @brief Test we handle simple case difference correctly.
+ * This function tests we handle one-char case difference correctly
+ * with different compare options. In this test the difference is
+ * the first char in word.
+ */
+void DifferentStrings1::CasesDiffer1()
+{
+ wdiffarray diffs;
+ CString string1(_T("Test"));
+ CString string2(_T("test"));
+ int count = 0;
+
+ // Compare case, all whitespaces, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+
+ // Ignore case, all whitespaces, whitespace break
+ // No difference
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+
+ // Compare case, whitespaces ignore, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+}
+
+/**
+ * @brief Test we handle simple case difference correctly.
+ * This function tests we handle one-char case difference correctly
+ * with different compare options. In this test the difference is
+ * in the middle of word.
+ */
+void DifferentStrings1::CasesDiffer2()
+{
+ wdiffarray diffs;
+ CString string1(_T("test"));
+ CString string2(_T("teSt"));
+ int count = 0;
+
+ // Compare case, all whitespaces, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+
+ // Ignore case, all whitespaces, whitespace break
+ // No difference
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+
+ // Compare case, whitespaces ignore, whitespace break
+ // We must find one difference
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+}
Added: trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/DifferentStrings1.h 2006-10-31 00:14:57 UTC (rev 3745)
@@ -0,0 +1,32 @@
+/**
+ * @file DifferentStrings1.h
+ *
+ * @brief Declaration for simple different strings tests..
+ */
+
+#ifndef _DIFFERENT_STRINGS1_H_
+#define _DIFFERENT_STRINGS1_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+
+/**
+ * @brief Simple different strings testing.
+ */
+class DifferentStrings1 : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( DifferentStrings1 );
+ CPPUNIT_TEST( CasesDiffer1 );
+ CPPUNIT_TEST( CasesDiffer2 );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp();
+ void tearDown();
+
+protected:
+ void CasesDiffer1();
+ void CasesDiffer2();
+};
+
+#endif // DIFFERENT_STRINGS1
Added: trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.cpp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.cpp 2006-10-31 00:14:57 UTC (rev 3745)
@@ -0,0 +1,198 @@
+/**
+ * @file IdenticalStrings1.h
+ *
+ * @brief Implementation for Identical strings testing.
+ */
+
+#include <cppunit/config/SourcePrefix.h>
+#include "stdafx.h"
+
+#include "CompareOptions.h"
+#include "stringdiffs.h"
+
+#include "IdenticalStrings1.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( IdenticalStrings1 );
+
+static const CString string1(_T("Test"));
+static const CString string2(_T("Test"));
+
+/** @brief Testcase initialization code. */
+void IdenticalStrings1::setUp()
+{
+ // Add possible initializations here
+}
+
+/** @brief Testcase cleanup code. */
+void IdenticalStrings1::tearDown()
+{
+ // Add possible cleanups here
+}
+
+/**
+ * @brief Test identical words are detected as such.
+ * This function tests that two identical words are detected
+ * as identical with different word-compare settings. This function
+ * tests whitespace-break, word-level compare.
+ */
+void IdenticalStrings1::IdenticalWord1()
+{
+ wdiffarray diffs;
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Compare case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Ignore case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces ignore, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
+
+/**
+ * @brief Test identical words are detected as such.
+ * This function tests that two identical words are detected
+ * as identical with different word-compare settings. This function
+ * tests punctuation-break, word-level compare.
+ */
+void IdenticalStrings1::IdenticalWord2()
+{
+ wdiffarray diffs;
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Compare case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Ignore case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces ignore, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
+
+/**
+ * @brief Test identical words are detected as such.
+ * This function tests that two identical words are detected
+ * as identical with different word-compare settings. This function
+ * tests whitespace-break, byte-level compare.
+ */
+void IdenticalStrings1::IdenticalWord3()
+{
+ wdiffarray diffs;
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Compare case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Ignore case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces ignore, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
+
+/**
+ * @brief Test identical words are detected as such.
+ * This function tests that two identical words are detected
+ * as identical with different word-compare settings. This function
+ * tests punctuation-break, byte-level compare.
+ */
+void IdenticalStrings1::IdenticalWord4()
+{
+ wdiffarray diffs;
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Compare case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 1, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Ignore case, all whitespaces, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 1, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces change, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 1, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ // Compare case, whitespaces ignore, whitespace break
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 1, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
Added: trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/IdenticalStrings1.h 2006-10-31 00:14:57 UTC (rev 3745)
@@ -0,0 +1,36 @@
+/**
+ * @file IdenticalStrings1.h
+ *
+ * @brief Declaration for identical strings.
+ */
+
+#ifndef _IDENTICAL_STRINGS1_H_
+#define _IDENTICAL_STRINGS1_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+
+/**
+ * @brief Identical string testing with different options.
+ */
+class IdenticalStrings1 : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( IdenticalStrings1 );
+ CPPUNIT_TEST( IdenticalWord1 );
+ CPPUNIT_TEST( IdenticalWord2 );
+ CPPUNIT_TEST( IdenticalWord3 );
+ CPPUNIT_TEST( IdenticalWord4 );
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void setUp();
+ void tearDown();
+
+protected:
+ void IdenticalWord1();
+ void IdenticalWord2();
+ void IdenticalWord3();
+ void IdenticalWord4();
+};
+
+#endif // IDENTICAL_STRINGS1
Modified: trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp 2006-10-30 21:02:36 UTC (rev 3744)
+++ trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp 2006-10-31 00:14:57 UTC (rev 3745)
@@ -64,8 +64,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm- /GR /GX /ZI /Od /I "..\..\..\Externals\cppunit\include" /I "..\..\..\Src" /I "..\..\..\Src\Common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GR /GX /ZI /Od /I "..\..\..\Externals\cppunit\include" /I "..\..\..\Src" /I "..\..\..\Src\Common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FD /GZ /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x40b /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x40b /d "_DEBUG" /d "_AFXDLL"
@@ -125,6 +125,22 @@
# PROP Default_Filter ""
# Begin Source File
+SOURCE=.\DifferentStrings1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\DifferentStrings1.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\IdenticalStrings1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IdenticalStrings1.h
+# End Source File
+# Begin Source File
+
SOURCE=.\TestCase1.cpp
# End Source File
# Begin Source File
Modified: trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp 2006-10-30 21:02:36 UTC (rev 3744)
+++ trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp 2006-10-31 00:14:57 UTC (rev 3745)
@@ -1,3 +1,8 @@
+/**
+ * @file TestCase1.h
+ *
+ * @brief Implementatino for first simple test case.
+ */
#include <cppunit/config/SourcePrefix.h>
#include "stdafx.h"
@@ -9,16 +14,23 @@
CPPUNIT_TEST_SUITE_REGISTRATION( TestCase1 );
+/** @brief Testcase initialization code. */
void TestCase1::setUp()
{
// Add possible initializations here
}
+/** @brief Testcase cleanup code. */
void TestCase1::tearDown()
{
// Add possible cleanups here
}
+/**
+ * @brief Test identical words are detected as such.
+ * This function tests that two identical words are detected
+ * as identical with different word-compare settings.
+ */
void TestCase1::Identical1()
{
wdiffarray diffs;
@@ -26,93 +38,40 @@
CString string2(_T("Test"));
int count = 0;
- // Break type is whitespace or punctuation
-
- // Check strings with different settings
+ // Compare case, all whitespaces, whitespace break
sd_ComputeWordDiffs(string1, string2,
true, WHITESPACE_COMPARE_ALL, 0, false,
&diffs);
count = diffs.GetSize();
CPPUNIT_ASSERT(count == 0);
+ // Ignore case, all whitespaces, whitespace break
sd_ComputeWordDiffs(string1, string2,
false, WHITESPACE_COMPARE_ALL, 0, false,
&diffs);
count = diffs.GetSize();
CPPUNIT_ASSERT(count == 0);
+ // Compare case, whitespaces change, whitespace break
sd_ComputeWordDiffs(string1, string2,
true, WHITESPACE_IGNORE_CHANGE, 0, false,
&diffs);
count = diffs.GetSize();
CPPUNIT_ASSERT(count == 0);
+ // Compare case, whitespaces ignore, whitespace break
sd_ComputeWordDiffs(string1, string2,
true, WHITESPACE_IGNORE_ALL, 0, false,
&diffs);
count = diffs.GetSize();
CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_COMPARE_ALL, 1, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_COMPARE_ALL, 0, true,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
}
-void TestCase1::Identical2()
-{
- wdiffarray diffs;
- CString string1(_T("Test words"));
- CString string2(_T("Test words"));
- int count = 0;
-
- // Break type is whitespace or punctuation
-
- // Check strings with different settings
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_COMPARE_ALL, 0, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- false, WHITESPACE_COMPARE_ALL, 0, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_IGNORE_CHANGE, 0, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_IGNORE_ALL, 0, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_COMPARE_ALL, 1, false,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-
- sd_ComputeWordDiffs(string1, string2,
- true, WHITESPACE_COMPARE_ALL, 0, true,
- &diffs);
- count = diffs.GetSize();
- CPPUNIT_ASSERT(count == 0);
-}
-
+/**
+ * @brief Test different words are detected as such.
+ * This function tests that two different words are detected
+ * as different with different word-compare settings.
+ */
void TestCase1::Difference1()
{
wdiffarray diffs;
@@ -149,6 +108,11 @@
diffs.RemoveAll();
}
+/**
+ * @brief Test different two-words are detected as such.
+ * This function tests that two different two-words are detected
+ * as different with different word-compare settings.
+ */
void TestCase1::Difference2()
{
wdiffarray diffs;
Modified: trunk/Testing/CppUnit/StringDifferencing/TestCase1.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/TestCase1.h 2006-10-30 21:02:36 UTC (rev 3744)
+++ trunk/Testing/CppUnit/StringDifferencing/TestCase1.h 2006-10-31 00:14:57 UTC (rev 3745)
@@ -1,3 +1,9 @@
+/**
+ * @file TestCase1.h
+ *
+ * @brief Declaration for first simple test case.
+ */
+
#ifndef _TESTCASE1_H_
#define _TESTCASE1_H_
@@ -3,16 +9,18 @@
#include <cppunit/extensions/HelperMacros.h>
+
+/**
+ * @brief First simple testcase for StringDifferencing.
+ * This is simple test case meant more of an example for writing testcases.
+ * But of course this does some useful testing also. :)
+ */
class TestCase1 : public CPPUNIT_NS::TestFixture
{
CPPUNIT_TEST_SUITE( TestCase1 );
CPPUNIT_TEST( Identical1 );
- CPPUNIT_TEST( Identical2 );
CPPUNIT_TEST( Difference1 );
CPPUNIT_TEST( Difference2 );
CPPUNIT_TEST_SUITE_END();
-protected:
-
-
public:
void setUp();
@@ -21,11 +29,9 @@
protected:
void Identical1();
- void Identical2();
void Difference1();
void Difference2();
};
-
-#endif
+#endif // _TESTCASE1_H_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 21:02:45
|
Revision: 3744
http://svn.sourceforge.net/winmerge/?rev=3744&view=rev
Author: gerundt
Date: 2006-10-30 13:02:36 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Remove unnecessary image "unknown.gif".
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
Removed Paths:
-------------
branches/R2_6/Docs/Users/Manual/screenshots/unknown.gif
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 21:01:32 UTC (rev 3743)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 21:02:36 UTC (rev 3744)
@@ -2,6 +2,8 @@
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Manual/screenshots new file: missing_lines.png
Manual/screenshots deleted file: example1.gif
+ Remove unnecessary image "unknown.gif".
+ Manual/screenshots deleted file: unknown.gif
2006-10-19 Kimmo
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Deleted: branches/R2_6/Docs/Users/Manual/screenshots/unknown.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 21:01:48
|
Revision: 3743
http://svn.sourceforge.net/winmerge/?rev=3743&view=rev
Author: gerundt
Date: 2006-10-30 13:01:32 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
Remove unnecessary image "unknown.gif".
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
Removed Paths:
-------------
trunk/Docs/Users/Manual/screenshots/unknown.gif
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-30 20:57:10 UTC (rev 3742)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-30 21:01:32 UTC (rev 3743)
@@ -2,6 +2,8 @@
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Manual/screenshots new file: missing_lines.png
Manual/screenshots deleted file: example1.gif
+ Remove unnecessary image "unknown.gif".
+ Manual/screenshots deleted file: unknown.gif
2006-10-19 Kimmo
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Deleted: trunk/Docs/Users/Manual/screenshots/unknown.gif
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:57:28
|
Revision: 3742
http://svn.sourceforge.net/winmerge/?rev=3742&view=rev
Author: gerundt
Date: 2006-10-30 12:57:10 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Intro_diffs.xml
Added Paths:
-----------
branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.png
Removed Paths:
-------------
branches/R2_6/Docs/Users/Manual/screenshots/example1.gif
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 20:53:59 UTC (rev 3741)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-30 20:57:10 UTC (rev 3742)
@@ -1,3 +1,8 @@
+2006-10-30 Tim
+ PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
+ Manual/screenshots new file: missing_lines.png
+ Manual/screenshots deleted file: example1.gif
+
2006-10-19 Kimmo
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Manual: Install.xml
Modified: branches/R2_6/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:53:59 UTC (rev 3741)
+++ branches/R2_6/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:57:10 UTC (rev 3742)
@@ -26,7 +26,7 @@
<para>In example 1 there are 3 different lines in file1 and 1 different line in file2. In WinMerge differences must always have same amount of lines in both files. So WinMerge must add 2 empty lines to file2 so that both files have 3 different lines. We call these added empty lines as "missing lines" since they really don't exist in file2. Screenshot shows it:</para>
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/example1.gif" format="GIF"/>
+ <imagedata fileref="screenshots/missing_lines.png" format="PNG"/>
</imageobject>
</inlinemediaobject></para>
<para>If text is typed or copy-pasted to missing lines they become real lines.</para>
Deleted: branches/R2_6/Docs/Users/Manual/screenshots/example1.gif
===================================================================
(Binary files differ)
Added: branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/missing_lines.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:54:18
|
Revision: 3741
http://svn.sourceforge.net/winmerge/?rev=3741&view=rev
Author: gerundt
Date: 2006-10-30 12:53:59 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Intro_diffs.xml
Added Paths:
-----------
trunk/Docs/Users/Manual/screenshots/missing_lines.png
Removed Paths:
-------------
trunk/Docs/Users/Manual/screenshots/example1.gif
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-30 20:46:42 UTC (rev 3740)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-30 20:53:59 UTC (rev 3741)
@@ -1,3 +1,8 @@
+2006-10-30 Tim
+ PATCH: [ 1586867 ] Manual: Replace "example1.gif" with new PNG version
+ Manual/screenshots new file: missing_lines.png
+ Manual/screenshots deleted file: example1.gif
+
2006-10-19 Kimmo
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Manual: Install.xml
Modified: trunk/Docs/Users/Manual/Intro_diffs.xml
===================================================================
--- trunk/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:46:42 UTC (rev 3740)
+++ trunk/Docs/Users/Manual/Intro_diffs.xml 2006-10-30 20:53:59 UTC (rev 3741)
@@ -26,7 +26,7 @@
<para>In example 1 there are 3 different lines in file1 and 1 different line in file2. In WinMerge differences must always have same amount of lines in both files. So WinMerge must add 2 empty lines to file2 so that both files have 3 different lines. We call these added empty lines as "missing lines" since they really don't exist in file2. Screenshot shows it:</para>
<para><inlinemediaobject>
<imageobject>
- <imagedata fileref="screenshots/example1.gif" format="GIF"/>
+ <imagedata fileref="screenshots/missing_lines.png" format="PNG"/>
</imageobject>
</inlinemediaobject></para>
<para>If text is typed or copy-pasted to missing lines they become real lines.</para>
Deleted: trunk/Docs/Users/Manual/screenshots/example1.gif
===================================================================
(Binary files differ)
Added: trunk/Docs/Users/Manual/screenshots/missing_lines.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/missing_lines.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:46:51
|
Revision: 3740
http://svn.sourceforge.net/winmerge/?rev=3740&view=rev
Author: gerundt
Date: 2006-10-30 12:46:42 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1587213 ] Web: WinMerge 2.6 favicon.ico
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/favicon.ico
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-30 20:40:35 UTC (rev 3739)
+++ trunk/Web/Changes.txt 2006-10-30 20:46:42 UTC (rev 3740)
@@ -1,6 +1,8 @@
2006-10-30 Tim
BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
Web\developer\l10n: status.php
+ PATCH: [ 1587213 ] Web: WinMerge 2.6 favicon.ico
+ Web: favicon.ico
2006-10-23 Tim
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Modified: trunk/Web/favicon.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:40:47
|
Revision: 3739
http://svn.sourceforge.net/winmerge/?rev=3739&view=rev
Author: gerundt
Date: 2006-10-30 12:40:35 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-30 17:02:39 UTC (rev 3738)
+++ trunk/Web/Changes.txt 2006-10-30 20:40:35 UTC (rev 3739)
@@ -1,3 +1,7 @@
+2006-10-30 Tim
+ BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
+ Web\developer\l10n: status.php
+
2006-10-23 Tim
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Web: WinMergePAD.php
Modified: trunk/Web/developer/l10n/status.php
===================================================================
--- trunk/Web/developer/l10n/status.php 2006-10-30 17:02:39 UTC (rev 3738)
+++ trunk/Web/developer/l10n/status.php 2006-10-30 20:40:35 UTC (rev 3739)
@@ -96,13 +96,13 @@
switch ($version) {
case '2.6':
- $version_26 = '<span title="upcoming stable version">2.6</span>';
+ $version_26 = '<strong title="latest stable version">2.6</strong>';
break;
case '2.5':
- $version_25 = '<span title="latest development version">2.5</span>';
+ $version_25 = '<span title="older development version">2.5</span>';
break;
case '2.4':
- $version_24 = '<strong title="latest stable version">2.4</strong>';
+ $version_24 = '<span title="older stable version">2.4</span>';
break;
case '2.2':
$version_22 = '<span title="older stable version">2.2</span>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-30 17:03:24
|
Revision: 3738
http://svn.sourceforge.net/winmerge/?rev=3738&view=rev
Author: kimmov
Date: 2006-10-30 09:02:39 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
trunk/Src/Languages/Brazilian/MergeBrazilian.rc
trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
trunk/Src/Languages/Catalan/MergeCatalan.rc
trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
trunk/Src/Languages/Czech/MergeCzech.rc
trunk/Src/Languages/Danish/MergeDanish.rc
trunk/Src/Languages/Dutch/MergeDutch.rc
trunk/Src/Languages/French/MergeFrench.rc
trunk/Src/Languages/German/MergeGerman.rc
trunk/Src/Languages/Hungarian/MergeHungarian.rc
trunk/Src/Languages/Italian/MergeItalian.rc
trunk/Src/Languages/Japanese/MergeJapanese.rc
trunk/Src/Languages/Korean/MergeKorean.rc
trunk/Src/Languages/Norwegian/MergeNorwegian.rc
trunk/Src/Languages/Polish/MergePolish.rc
trunk/Src/Languages/Russian/MergeRussian.rc
trunk/Src/Languages/Slovak/MergeSlovak.rc
trunk/Src/Languages/Spanish/MergeSpanish.rc
trunk/Src/Languages/Swedish/MergeSwedish.rc
trunk/Src/Languages/Turkish/MergeTurkish.rc
trunk/Src/Merge.rc
trunk/Src/resource.h
Removed Paths:
-------------
trunk/Src/res/unknown.ico
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Changes.txt 2006-10-30 17:02:39 UTC (rev 3738)
@@ -6,6 +6,10 @@
PATCH: [ 1586869 ] Fix File Select -dialog modality
Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+ PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
+ Src: DirView.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ Remove file: Src/Res: unknown.ico
2006-10-26 Gal
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/DirView.cpp 2006-10-30 17:02:39 UTC (rev 3738)
@@ -65,6 +65,32 @@
*/
const int TimeToSignalCompare = 3;
+/**
+ * @brief Folder compare icon indexes.
+ * This enum defines indexes for imagelist used for folder compare icons.
+ * Note that this enum must be in synch with code in OnInitialUpdate() and
+ * GetColImage(). Also remember that icons are in resource file...
+ */
+static enum
+{
+ DIFFIMG_LUNIQUE,
+ DIFFIMG_RUNIQUE,
+ DIFFIMG_DIFF,
+ DIFFIMG_SAME,
+ DIFFIMG_BINSAME,
+ DIFFIMG_BINDIFF,
+ DIFFIMG_LDIRUNIQUE,
+ DIFFIMG_RDIRUNIQUE,
+ DIFFIMG_SKIP,
+ DIFFIMG_DIRSKIP,
+ DIFFIMG_DIR,
+ DIFFIMG_ERROR,
+ DIFFIMG_DIRUP,
+ DIFFIMG_DIRUP_DISABLE,
+ DIFFIMG_ABORT,
+};
+
+
/////////////////////////////////////////////////////////////////////////////
// CDirView
@@ -240,7 +266,6 @@
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_RFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_NOTEQUALFILE)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALFILE)));
- VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_UNKNOWN)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_EQUALBINARY)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_BINARYDIFF)));
VERIFY(-1 != m_imageList.Add(AfxGetApp()->LoadIcon(IDI_LFOLDER)));
@@ -272,24 +297,6 @@
m_pList->SetExtendedStyle(exstyle);
}
-// These are the offsets into the image list created in OnInitDialog
-#define DIFFIMG_LUNIQUE 0
-#define DIFFIMG_RUNIQUE 1
-#define DIFFIMG_DIFF 2
-#define DIFFIMG_SAME 3
-#define DIFFIMG_UNKNOWN 4
-#define DIFFIMG_BINSAME 5
-#define DIFFIMG_BINDIFF 6
-#define DIFFIMG_LDIRUNIQUE 7
-#define DIFFIMG_RDIRUNIQUE 8
-#define DIFFIMG_SKIP 9
-#define DIFFIMG_DIRSKIP 10
-#define DIFFIMG_DIR 11
-#define DIFFIMG_ERROR 12
-#define DIFFIMG_DIRUP 13
-#define DIFFIMG_DIRUP_DISABLE 14
-#define DIFFIMG_ABORT 15
-
/**
* @brief Return image index appropriate for this row
*/
Modified: trunk/Src/Languages/Brazilian/MergeBrazilian.rc
===================================================================
--- trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Brazilian/MergeBrazilian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Bulgarian/MergeBulgarian.rc
===================================================================
--- trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Bulgarian/MergeBulgarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Catalan/MergeCatalan.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
@@ -2011,7 +2010,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Mida
+ IDS_COMPMETHOD_SIZE "Mida"
END
// FILTER OPTIONS
Modified: trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
===================================================================
--- trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -82,7 +82,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
===================================================================
--- trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Czech/MergeCzech.rc
===================================================================
--- trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Czech/MergeCzech.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Danish/MergeDanish.rc
===================================================================
--- trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Danish/MergeDanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Dutch/MergeDutch.rc
===================================================================
--- trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Dutch/MergeDutch.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/French/MergeFrench.rc
===================================================================
--- trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/French/MergeFrench.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -78,7 +78,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/German/MergeGerman.rc
===================================================================
--- trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/German/MergeGerman.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Hungarian/MergeHungarian.rc
===================================================================
--- trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Hungarian/MergeHungarian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Italian/MergeItalian.rc
===================================================================
--- trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Italian/MergeItalian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Japanese/MergeJapanese.rc
===================================================================
--- trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Japanese/MergeJapanese.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Korean/MergeKorean.rc
===================================================================
--- trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Korean/MergeKorean.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Norwegian/MergeNorwegian.rc
===================================================================
--- trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Norwegian/MergeNorwegian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Polish/MergePolish.rc
===================================================================
--- trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Polish/MergePolish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Russian/MergeRussian.rc
===================================================================
--- trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Russian/MergeRussian.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Slovak/MergeSlovak.rc
===================================================================
--- trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Slovak/MergeSlovak.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Spanish/MergeSpanish.rc
===================================================================
--- trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Spanish/MergeSpanish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Swedish/MergeSwedish.rc
===================================================================
--- trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Swedish/MergeSwedish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Languages/Turkish/MergeTurkish.rc
===================================================================
--- trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Languages/Turkish/MergeTurkish.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "..\\..\\res\\folderskip.ico"
IDI_EQUALFILE ICON "..\\..\\res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "..\\..\\res\\notequalfile.ico"
-IDI_UNKNOWN ICON "..\\..\\res\\unknown.ico"
IDI_EQUALBINARY ICON "..\\..\\res\\equalbinary.ico"
IDI_LFILE ICON "..\\..\\res\\lfile.ico"
IDI_RFILE ICON "..\\..\\res\\rfile.ico"
Modified: trunk/Src/Merge.rc
===================================================================
--- trunk/Src/Merge.rc 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/Merge.rc 2006-10-30 17:02:39 UTC (rev 3738)
@@ -80,7 +80,6 @@
IDI_FOLDERSKIP ICON "res\\folderskip.ico"
IDI_EQUALFILE ICON "res\\equalfile.ico"
IDI_NOTEQUALFILE ICON "res\\notequalfile.ico"
-IDI_UNKNOWN ICON "res\\unknown.ico"
IDI_EQUALBINARY ICON "res\\equalbinary.ico"
IDI_LFILE ICON "res\\lfile.ico"
IDI_RFILE ICON "res\\rfile.ico"
Deleted: trunk/Src/res/unknown.ico
===================================================================
(Binary files differ)
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2006-10-30 16:30:00 UTC (rev 3737)
+++ trunk/Src/resource.h 2006-10-30 17:02:39 UTC (rev 3738)
@@ -89,17 +89,16 @@
#define IDI_FOLDERSKIP 503
#define IDI_EQUALFILE 504
#define IDI_NOTEQUALFILE 505
-#define IDI_UNKNOWN 506
-#define IDI_EQUALBINARY 507
-#define IDI_LFILE 508
-#define IDI_RFILE 509
-#define IDI_BINARYDIFF 510
-#define IDI_FILESKIP 511
-#define IDI_COMPARE_ERROR 512
-#define IDI_FOLDERUP 513
-#define IDI_FOLDERUP_DISABLE 514
-#define IDI_SIGMA 515
-#define IDI_COMPARE_ABORTED 516
+#define IDI_EQUALBINARY 506
+#define IDI_LFILE 507
+#define IDI_RFILE 508
+#define IDI_BINARYDIFF 509
+#define IDI_FILESKIP 510
+#define IDI_COMPARE_ERROR 511
+#define IDI_FOLDERUP 512
+#define IDI_FOLDERUP_DISABLE 513
+#define IDI_SIGMA 514
+#define IDI_COMPARE_ABORTED 515
#define IDC_LEFT_EDIT 1000
#define IDC_FILE_EDIT 1000
#define IDC_LEFT_BUTTON 1001
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-30 16:30:30
|
Revision: 3737
http://svn.sourceforge.net/winmerge/?rev=3737&view=rev
Author: kimmov
Date: 2006-10-30 08:30:00 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1586869 ] Fix File Select -dialog modality
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirCmpReportDlg.cpp
trunk/Src/FileFiltersDlg.cpp
trunk/Src/MainFrm.cpp
trunk/Src/Merge.cpp
trunk/Src/Merge.h
trunk/Src/MergeDoc.cpp
trunk/Src/PatchDlg.cpp
trunk/Src/ProjectFilePathsDlg.cpp
trunk/Src/PropRegistry.cpp
trunk/Src/PropVss.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Changes.txt 2006-10-30 16:30:00 UTC (rev 3737)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-30 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality
+ Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
+ MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+
2006-10-26 Gal
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
Src/: BCMenu.cpp
Modified: trunk/Src/DirCmpReportDlg.cpp
===================================================================
--- trunk/Src/DirCmpReportDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/DirCmpReportDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -118,7 +118,8 @@
int filterid = f_types[m_ctlStyle.GetCurSel()].browseFilter;
CString chosenFilepath;
- if (SelectFile(chosenFilepath, folder, title, filterid, FALSE))
+ if (SelectFile(GetSafeHwnd(), chosenFilepath, folder, title,
+ filterid, FALSE))
{
CString name;
SplitFilename(chosenFilepath, &folder, &name, NULL);
Modified: trunk/Src/FileFiltersDlg.cpp
===================================================================
--- trunk/Src/FileFiltersDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/FileFiltersDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -408,7 +408,8 @@
path += '\\';
CString s;
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ FALSE))
{
// Fix file extension
TCHAR file[_MAX_FNAME] = {0};
@@ -537,7 +538,8 @@
CString userPath = theApp.m_globalFileFilter.GetUserFilterPathWithCreate();
CString title = LoadResString(IDS_FILEFILTER_INSTALL);
- if (SelectFile(s, path, title, IDS_FILEFILTER_FILEMASK, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, path, title, IDS_FILEFILTER_FILEMASK,
+ TRUE))
{
CString filename, ext;
SplitFilename(s, NULL, &filename, &ext);
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/MainFrm.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -895,7 +895,7 @@
if (!bMultiFile)
{
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
- if (SelectFile(s, strSavePath, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, strSavePath, title, NULL, FALSE))
{
strSavePath = s;
nRetVal = IDNO;
@@ -2709,7 +2709,8 @@
// get the default projects path
CString strProjectPath = m_options.GetString(OPT_PROJECTS_PATH);
- if (!SelectFile(sFilepath, strProjectPath, title, IDS_PROJECTFILES, TRUE))
+ if (!SelectFile(GetSafeHwnd(), sFilepath, strProjectPath, title, IDS_PROJECTFILES,
+ TRUE))
return;
strProjectPath = paths_GetParentPath(sFilepath);
Modified: trunk/Src/Merge.cpp
===================================================================
--- trunk/Src/Merge.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Merge.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -364,18 +364,18 @@
/**
* @brief Helper function for selecting dir/file
+ * @param [in] parent Handle to parent window. Can be a NULL, but then
+ * CMainFrame is used which can cause modality problems.
* @param [out] path Selected path is returned in this string
* @param [in] initialPath Initial path (and file) shown when dialog is opened
* @param [in] title Title for path selection dialog
- * @param [in] filterid 0 or STRING ID for filter string - 0 means "All files (*.*)"
+ * @param [in] filterid 0 or STRING ID for filter string
+ * - 0 means "All files (*.*)"
* @param [in] is_open Selects Open/Save -dialog
*/
-BOOL SelectFile(
- CString& path,
- LPCTSTR initialPath /*=NULL*/,
- LPCTSTR title /*= _T("Open")*/,
- UINT filterid /*=0*/,
- BOOL is_open /*=TRUE*/)
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR initialPath /*=NULL*/,
+ LPCTSTR title /*= _T("Open")*/, UINT filterid /*=0*/,
+ BOOL is_open /*=TRUE*/)
{
path.Empty(); // Clear output param
@@ -394,20 +394,24 @@
SplitFilename(initialPath, 0, &sSelectedFile, 0);
}
}
+
+ if (parent == NULL)
+ parent = AfxGetMainWnd()->GetSafeHwnd();
if (!filterid)
filterid = IDS_ALLFILES;
- CString filters;
- VERIFY(filters.LoadString(filterid));
+ CString filters = LoadResString(filterid);
+
// Convert extension mask from MFC style separators ('|')
// to Win32 style separators ('\0')
LPTSTR filtersStr = filters.GetBuffer(0);
ConvertFilter(filtersStr);
+ filters.ReleaseBuffer();
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
ofn.lStructSize = sizeof(ofn);
- ofn.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
+ ofn.hwndOwner = parent;
ofn.lpstrFilter = filtersStr;
ofn.lpstrCustomFilter = NULL;
ofn.nFilterIndex = 1;
Modified: trunk/Src/Merge.h
===================================================================
--- trunk/Src/Merge.h 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/Merge.h 2006-10-30 16:30:00 UTC (rev 3737)
@@ -119,9 +119,8 @@
/////////////////////////////////////////////////////////////////////////////
CMergeDoc *GetDoc();
-BOOL SelectFile(CString& path, LPCTSTR root_path = NULL,
- LPCTSTR title = _T("Open"),
- UINT filterid =0,
+BOOL SelectFile(HWND parent, CString& path, LPCTSTR root_path = NULL,
+ LPCTSTR title = _T("Open"), UINT filterid = 0,
BOOL is_open =TRUE);
BOOL SelectFolder(CString& path, LPCTSTR root_path = NULL,
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/MergeDoc.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -978,6 +978,8 @@
CString title;
BOOL result = TRUE;
int answer = IDOK; // Set default we use for scratchpads
+ int nActiveViewIndexType = GetActiveMergeViewIndexType();
+ HWND parent = m_pView[nActiveViewIndexType]->GetSafeHwnd();
// We shouldn't get here if saving is succeed before
ASSERT(nSaveResult != SAVE_DONE);
@@ -1008,7 +1010,7 @@
else
VERIFY(title.LoadString(IDS_SAVE_RIGHT_AS));
- if (SelectFile(s, strPath, title, NULL, FALSE))
+ if (SelectFile(parent, s, strPath, title, NULL, FALSE))
{
CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer];
strSavePath = s;
Modified: trunk/Src/PatchDlg.cpp
===================================================================
--- trunk/Src/PatchDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PatchDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -257,7 +257,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file1;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, TRUE);
m_ctlFile1.SetWindowText(s);
@@ -276,7 +276,7 @@
VERIFY(title.LoadString(IDS_OPEN_TITLE));
folder = m_file2;
- if (SelectFile(s, folder, title, NULL, TRUE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, TRUE))
{
ChangeFile(s, FALSE);
m_ctlFile2.SetWindowText(s);
@@ -334,7 +334,7 @@
VERIFY(title.LoadString(IDS_SAVE_AS_TITLE));
folder = m_fileResult;
- if (SelectFile(s, folder, title, NULL, FALSE))
+ if (SelectFile(GetSafeHwnd(), s, folder, title, NULL, FALSE))
{
SplitFilename(s, &folder, &name, NULL);
m_fileResult = s;
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -73,7 +73,8 @@
void ProjectFilePathsDlg::OnBnClickedProjLfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sLeftFile, m_sLeftFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sLeftFile, m_sLeftFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -83,7 +84,8 @@
void ProjectFilePathsDlg::OnBnClickedProjRfileBrowse()
{
UpdateData(TRUE);
- if (::SelectFile(m_sRightFile, m_sRightFile, NULL, NULL, TRUE))
+ if (::SelectFile(GetSafeHwnd(), m_sRightFile, m_sRightFile, NULL, NULL,
+ TRUE))
UpdateData(FALSE);
}
@@ -227,7 +229,8 @@
CString strProjectFileName;
CString strProjectPath = GetOptionsMgr()->GetString(OPT_PROJECTS_PATH);
- if (!::SelectFile(strProjectFileName, strProjectPath, NULL, IDS_PROJECTFILES, bOpen))
+ if (!::SelectFile(GetSafeHwnd(), strProjectFileName, strProjectPath, NULL,
+ IDS_PROJECTFILES, bOpen))
return _T("");
if (strProjectFileName.IsEmpty())
Modified: trunk/Src/PropRegistry.cpp
===================================================================
--- trunk/Src/PropRegistry.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PropRegistry.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -237,7 +237,7 @@
CString title;
VERIFY(title.LoadString(IDS_OPEN_TITLE));
- if (SelectFile(path, NULL, title, IDS_PROGRAMFILES, TRUE))
+ if (SelectFile(GetSafeHwnd(), path, NULL, title, IDS_PROGRAMFILES, TRUE))
{
m_strEditorPath = path;
UpdateData(FALSE);
Modified: trunk/Src/PropVss.cpp
===================================================================
--- trunk/Src/PropVss.cpp 2006-10-29 14:49:14 UTC (rev 3736)
+++ trunk/Src/PropVss.cpp 2006-10-30 16:30:00 UTC (rev 3737)
@@ -91,7 +91,7 @@
void CPropVss::OnBrowseButton()
{
CString s;
- if (SelectFile(s))
+ if (SelectFile(GetSafeHwnd(), s))
{
m_strPath = s;
m_ctlPath.SetWindowText(s);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-29 14:49:22
|
Revision: 3736
http://svn.sourceforge.net/winmerge/?rev=3736&view=rev
Author: kimmov
Date: 2006-10-29 06:49:14 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
PATCH: [ 1583386 ] Drop Delphi plugin binary
Modified Paths:
--------------
trunk/Plugins/Changes.txt
Removed Paths:
-------------
trunk/Plugins/dlls/UnpackDFM.dll
Modified: trunk/Plugins/Changes.txt
===================================================================
--- trunk/Plugins/Changes.txt 2006-10-29 14:41:26 UTC (rev 3735)
+++ trunk/Plugins/Changes.txt 2006-10-29 14:49:14 UTC (rev 3736)
@@ -2,6 +2,10 @@
Add new items to top
(This summarizes all changes to all plugins.)
+2006-10-29 Kimmo
+ PATCH: [ 1583386 ] Drop Delphi plugin binary
+ Remove file Plugins\dlls: UnpackDFM.dll
+
2006-08-03 Kimmo
Fix HideFirstLetter plugin compile with VS2003.Net. Bump version number to 1.0.1.
Plugins\src_VCPP\HideFirstLetter:
Deleted: trunk/Plugins/dlls/UnpackDFM.dll
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-29 14:41:43
|
Revision: 3735
http://svn.sourceforge.net/winmerge/?rev=3735&view=rev
Author: kimmov
Date: 2006-10-29 06:41:26 -0800 (Sun, 29 Oct 2006)
Log Message:
-----------
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
branches/R2_6/Src/MainFrm.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-27 15:18:59 UTC (rev 3734)
+++ branches/R2_6/Src/Changes.txt 2006-10-29 14:41:26 UTC (rev 3735)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-29 Kimmo
+ PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
+ Src: MainFrm.cpp MainFrm.h
+
2006-10-24 Tim
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Src/res deleted file: Toolbar.bmp
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-10-27 15:18:59 UTC (rev 3734)
+++ branches/R2_6/Src/MainFrm.cpp 2006-10-29 14:41:26 UTC (rev 3735)
@@ -241,7 +241,8 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- CString pathFilters = GetDefaultFilterUserPath();
+ // No filter path, set it to default and make sure it exists.
+ CString pathFilters = GetDefaultFilterUserPath(TRUE);
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2321,9 +2322,16 @@
}
/**
- * @brief Get default user filter folder path
+ * @brief Get default user filter folder path.
+ * This function returns the default filter path for user filters.
+ * If wanted so (@p bCreate) path can be created if it does not
+ * exist yet. But you really want to create the patch only when
+ * there is no user path defined.
+ * @param [in] bCreate If TRUE filter path is created if it does
+ * not exist.
+ * @return Default folder for user filters.
*/
-CString CMainFrame::GetDefaultFilterUserPath()
+CString CMainFrame::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
{
CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
CString pathFilters(pathMyFolders);
@@ -2331,7 +2339,7 @@
pathFilters += _T("\\");
pathFilters += DefaultRelativeFilterPath;
- if (!paths_CreateIfNeeded(pathFilters))
+ if (bCreate && !paths_CreateIfNeeded(pathFilters))
{
// Failed to create a folder, check it didn't already
// exist.
Modified: branches/R2_6/Src/MainFrm.h
===================================================================
--- branches/R2_6/Src/MainFrm.h 2006-10-27 15:18:59 UTC (rev 3734)
+++ branches/R2_6/Src/MainFrm.h 2006-10-29 14:41:26 UTC (rev 3735)
@@ -117,7 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
- CString GetDefaultFilterUserPath();
+ CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-27 15:19:16
|
Revision: 3734
http://svn.sourceforge.net/winmerge/?rev=3734&view=rev
Author: kimmov
Date: 2006-10-27 08:18:59 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
PATCH: [ 1585418 ] CppUnit tests for StringDiff
Added Paths:
-----------
trunk/Testing/CppUnit/
trunk/Testing/CppUnit/Changes.txt
trunk/Testing/CppUnit/StringDifferencing/
trunk/Testing/CppUnit/StringDifferencing/ReadMe.txt
trunk/Testing/CppUnit/StringDifferencing/Resource.h
trunk/Testing/CppUnit/StringDifferencing/StdAfx.cpp
trunk/Testing/CppUnit/StringDifferencing/StdAfx.h
trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.cpp
trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp
trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.h
trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.rc
trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp
trunk/Testing/CppUnit/StringDifferencing/TestCase1.h
Added: trunk/Testing/CppUnit/Changes.txt
===================================================================
--- trunk/Testing/CppUnit/Changes.txt (rev 0)
+++ trunk/Testing/CppUnit/Changes.txt 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,8 @@
+Testing\selftest\Changes.txt
+
+2006-10-27 Kimmo
+ PATCH: [ 1585418 ] CppUnit tests for StringDiff
+ Add folder Testing/CppUnit for unit tests
+ Add folder CppUnit/StringDifferencing and its contents
+
+
Added: trunk/Testing/CppUnit/StringDifferencing/ReadMe.txt
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/ReadMe.txt (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/ReadMe.txt 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,42 @@
+========================================================================
+ CONSOLE APPLICATION : StringDifferencing
+========================================================================
+
+
+AppWizard has created this StringDifferencing application for you.
+
+This file contains a summary of what you will find in each of the files that
+make up your StringDifferencing application.
+
+StringDifferencing.dsp
+ This file (the project file) contains information at the project level and
+ is used to build a single project or subproject. Other users can share the
+ project (.dsp) file, but they should export the makefiles locally.
+
+StringDifferencing.cpp
+ This is the main application source file.
+
+StringDifferencing.rc
+ This is a listing of all of the Microsoft Windows resources that the
+ program uses. It includes the icons, bitmaps, and cursors that are stored
+ in the RES subdirectory. This file can be directly edited in Microsoft
+ Visual C++.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named StringDifferencing.pch and a precompiled types file named StdAfx.obj.
+
+Resource.h
+ This is the standard header file, which defines new resource IDs.
+ Microsoft Visual C++ reads and updates this file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Added: trunk/Testing/CppUnit/StringDifferencing/Resource.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/Resource.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/Resource.h 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by StringDifferencing.rc
+//
+#define IDS_HELLO 1
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Added: trunk/Testing/CppUnit/StringDifferencing/StdAfx.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StdAfx.cpp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StdAfx.cpp 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,36 @@
+// stdafx.cpp : source file that includes just the standard includes
+// StringDifferencing.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
+
+/**
+ * Code below is copied from /Src/StdAfx.h
+ */
+
+// Convert any negative inputs to negative char equivalents
+// This is aimed at correcting any chars mistakenly
+// sign-extended to negative ints.
+// This is ok for the UNICODE build because UCS-2LE code bytes
+// do not extend as high as 2Gig (actually even full Unicode
+// codepoints don't extend that high).
+static wint_t normch(wint_t c)
+{
+#ifdef _UNICODE
+ return (unsigned short)(short)c;
+#else
+ return (unsigned char)(char)c;
+#endif
+}
+
+/**
+ * @brief Return non-zero if input character is a space.
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisspace (wint_t c)
+{
+ return _istspace (normch(c));
+}
Added: trunk/Testing/CppUnit/StringDifferencing/StdAfx.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StdAfx.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StdAfx.h 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,35 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#if !defined(AFX_STDAFX_H__D64D3318_60FB_479C_81CB_4AC3DFDC2103__INCLUDED_)
+#define AFX_STDAFX_H__D64D3318_60FB_479C_81CB_4AC3DFDC2103__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+
+#include <afx.h>
+#include <afxwin.h> // MFC core and standard components
+#include <afxext.h> // MFC extensions
+#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
+#include <afxtempl.h>
+
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h> // MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include <iostream>
+
+// TODO: reference additional headers your program requires here
+
+int xisspace (wint_t c);
+
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__D64D3318_60FB_479C_81CB_4AC3DFDC2103__INCLUDED_)
Added: trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.cpp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.cpp 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,73 @@
+// StringDifferencing.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include "StringDifferencing.h"
+
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
+#include <cppunit/ui/text/TestRunner.h>
+
+// Includes for testcases
+#include "TestCase1.h"
+
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only application object
+
+CWinApp theApp;
+
+using namespace std;
+
+int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
+{
+ int nRetCode = 0;
+
+ // initialize MFC and print and error on failure
+ if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
+ {
+ // TODO: change error code to suit your needs
+ cerr << _T("Fatal Error: MFC initialization failed") << endl;
+ nRetCode = 1;
+ }
+ else
+ {
+ /**
+ * This is the code running the tests.
+ * Tests are found automatically once they are created with
+ * CppUnit's macros, you don't need to run single tests here.
+ */
+ CPPUNIT_NS::TestResult controller;
+
+ // Add a listener that colllects test result
+ CPPUNIT_NS::TestResultCollector result;
+ controller.addListener( &result );
+
+ // Add a listener that print dots as test run.
+ CPPUNIT_NS::BriefTestProgressListener progress;
+ controller.addListener( &progress );
+
+ // Add the top suite to the test runner
+ CPPUNIT_NS::TestRunner runner;
+ runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
+ runner.run( controller );
+
+ // Print test in a compiler compatible format.
+ CPPUNIT_NS::CompilerOutputter outputter( &result, CPPUNIT_NS::stdCOut() );
+ outputter.write();
+ }
+
+ return nRetCode;
+}
+
+
Added: trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.dsp 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,148 @@
+# Microsoft Developer Studio Project File - Name="StringDifferencing" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=StringDifferencing - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "StringDifferencing.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "StringDifferencing.mak" CFG="StringDifferencing - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "StringDifferencing - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "StringDifferencing - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "StringDifferencing - Win32 Release"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
+# ADD BASE RSC /l 0x40b /d "NDEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x40b /d "NDEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF "$(CFG)" == "StringDifferencing - Win32 Debug"
+
+# PROP BASE Use_MFC 2
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 2
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm- /GR /GX /ZI /Od /I "..\..\..\Externals\cppunit\include" /I "..\..\..\Src" /I "..\..\..\Src\Common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x40b /d "_DEBUG" /d "_AFXDLL"
+# ADD RSC /l 0x40b /d "_DEBUG" /d "_AFXDLL"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunitd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\Build\CppUnit"
+# SUBTRACT LINK32 /incremental:no
+
+!ENDIF
+
+# Begin Target
+
+# Name "StringDifferencing - Win32 Release"
+# Name "StringDifferencing - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\StdAfx.cpp
+# ADD CPP /Yc"stdafx.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\StringDifferencing.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\StringDifferencing.rc
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StdAfx.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\StringDifferencing.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# Begin Group "Test Cases"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\TestCase1.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestCase1.h
+# End Source File
+# End Group
+# Begin Group "Files to Test"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\Src\stringdiffs.cpp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
Added: trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.h 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,12 @@
+
+#if !defined(AFX_STRINGDIFFERENCING_H__8A380B51_4087_460E_B2A5_55408D13BAA1__INCLUDED_)
+#define AFX_STRINGDIFFERENCING_H__8A380B51_4087_460E_B2A5_55408D13BAA1__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "resource.h"
+
+
+#endif // !defined(AFX_STRINGDIFFERENCING_H__8A380B51_4087_460E_B2A5_55408D13BAA1__INCLUDED_)
Added: trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.rc
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.rc (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/StringDifferencing.rc 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,70 @@
+//Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_HELLO "Hello from MFC!"
+END
+
+#endif
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
Added: trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/TestCase1.cpp 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,177 @@
+
+#include <cppunit/config/SourcePrefix.h>
+#include "stdafx.h"
+
+#include "CompareOptions.h"
+#include "stringdiffs.h"
+
+#include "TestCase1.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION( TestCase1 );
+
+void TestCase1::setUp()
+{
+ // Add possible initializations here
+}
+
+void TestCase1::tearDown()
+{
+ // Add possible cleanups here
+}
+
+void TestCase1::Identical1()
+{
+ wdiffarray diffs;
+ CString string1(_T("Test"));
+ CString string2(_T("Test"));
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
+
+void TestCase1::Identical2()
+{
+ wdiffarray diffs;
+ CString string1(_T("Test words"));
+ CString string2(_T("Test words"));
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_CHANGE, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_IGNORE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 1, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, true,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+}
+
+void TestCase1::Difference1()
+{
+ wdiffarray diffs;
+ CString string1(_T("Test"));
+ CString string2(_T("test"));
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+ diffs.RemoveAll();
+
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 1);
+ diffs.RemoveAll();
+
+ string1 = _T("tesT");
+ string2 = _T("test");
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT_MESSAGE(_T("testT & test difference not found!"), count == 1);
+ diffs.RemoveAll();
+}
+
+void TestCase1::Difference2()
+{
+ wdiffarray diffs;
+ CString string1(_T("Test string"));
+ CString string2(_T("test strIng"));
+ int count = 0;
+
+ // Break type is whitespace or punctuation
+
+ // Check strings with different settings
+ sd_ComputeWordDiffs(string1, string2,
+ false, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 0);
+ diffs.RemoveAll();
+
+ // This fails? Why?
+ // Shouldn't it it find two differences? But it founds only one?
+ sd_ComputeWordDiffs(string1, string2,
+ true, WHITESPACE_COMPARE_ALL, 0, false,
+ &diffs);
+ count = diffs.GetSize();
+ CPPUNIT_ASSERT(count == 2);
+ diffs.RemoveAll();
+}
Added: trunk/Testing/CppUnit/StringDifferencing/TestCase1.h
===================================================================
--- trunk/Testing/CppUnit/StringDifferencing/TestCase1.h (rev 0)
+++ trunk/Testing/CppUnit/StringDifferencing/TestCase1.h 2006-10-27 15:18:59 UTC (rev 3734)
@@ -0,0 +1,31 @@
+#ifndef _TESTCASE1_H_
+#define _TESTCASE1_H_
+
+#include <cppunit/extensions/HelperMacros.h>
+
+class TestCase1 : public CPPUNIT_NS::TestFixture
+{
+ CPPUNIT_TEST_SUITE( TestCase1 );
+ CPPUNIT_TEST( Identical1 );
+ CPPUNIT_TEST( Identical2 );
+ CPPUNIT_TEST( Difference1 );
+ CPPUNIT_TEST( Difference2 );
+ CPPUNIT_TEST_SUITE_END();
+
+protected:
+
+
+public:
+ void setUp();
+ void tearDown();
+
+protected:
+ void Identical1();
+ void Identical2();
+
+ void Difference1();
+ void Difference2();
+};
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-27 15:13:22
|
Revision: 3733
http://svn.sourceforge.net/winmerge/?rev=3733&view=rev
Author: kimmov
Date: 2006-10-27 08:07:00 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Add CppUnit unit-testing framework for C++. The latest version 1.12 from http://cppunit.sourceforge.net/
Added Paths:
-----------
trunk/Externals/
trunk/Externals/cppunit/
trunk/Externals/cppunit/AUTHORS
trunk/Externals/cppunit/BUGS
trunk/Externals/cppunit/COPYING
trunk/Externals/cppunit/ChangeLog
trunk/Externals/cppunit/CodingGuideLines.txt
trunk/Externals/cppunit/INSTALL
trunk/Externals/cppunit/INSTALL-WIN32.txt
trunk/Externals/cppunit/INSTALL-unix
trunk/Externals/cppunit/Makefile.am
trunk/Externals/cppunit/Makefile.in
trunk/Externals/cppunit/NEWS
trunk/Externals/cppunit/README
trunk/Externals/cppunit/THANKS
trunk/Externals/cppunit/TODO
trunk/Externals/cppunit/aclocal.m4
trunk/Externals/cppunit/config/
trunk/Externals/cppunit/config/ac_create_prefix_config_h.m4
trunk/Externals/cppunit/config/ac_cxx_have_sstream.m4
trunk/Externals/cppunit/config/ac_cxx_have_strstream.m4
trunk/Externals/cppunit/config/ac_cxx_namespaces.m4
trunk/Externals/cppunit/config/ac_cxx_rtti.m4
trunk/Externals/cppunit/config/ac_cxx_string_compare_string_first.m4
trunk/Externals/cppunit/config/ac_dll.m4
trunk/Externals/cppunit/config/ax_cxx_gcc_abi_demangle.m4
trunk/Externals/cppunit/config/bb_enable_doxygen.m4
trunk/Externals/cppunit/config/config.guess
trunk/Externals/cppunit/config/config.h.in
trunk/Externals/cppunit/config/config.sub
trunk/Externals/cppunit/config/depcomp
trunk/Externals/cppunit/config/install-sh
trunk/Externals/cppunit/config/ltmain.sh
trunk/Externals/cppunit/config/missing
trunk/Externals/cppunit/configure
trunk/Externals/cppunit/configure.in
trunk/Externals/cppunit/contrib/
trunk/Externals/cppunit/contrib/bc5/
trunk/Externals/cppunit/contrib/bc5/bcc-makefile.zip
trunk/Externals/cppunit/contrib/msvc/
trunk/Externals/cppunit/contrib/msvc/AddingUnitTestMethod.dsm
trunk/Externals/cppunit/contrib/msvc/CppUnit.WWTpl
trunk/Externals/cppunit/contrib/msvc/readme.txt
trunk/Externals/cppunit/contrib/xml-xsl/
trunk/Externals/cppunit/contrib/xml-xsl/report.xsl
trunk/Externals/cppunit/contrib/xml-xsl/tests.xml
trunk/Externals/cppunit/cppunit-config.1
trunk/Externals/cppunit/cppunit-config.in
trunk/Externals/cppunit/cppunit.m4
trunk/Externals/cppunit/cppunit.pc.in
trunk/Externals/cppunit/cppunit.spec
trunk/Externals/cppunit/cppunit.spec.in
trunk/Externals/cppunit/doc/
trunk/Externals/cppunit/doc/Doxyfile.in
trunk/Externals/cppunit/doc/FAQ
trunk/Externals/cppunit/doc/Makefile.am
trunk/Externals/cppunit/doc/Makefile.in
trunk/Externals/cppunit/doc/Money.dox
trunk/Externals/cppunit/doc/cookbook.dox
trunk/Externals/cppunit/doc/footer.html
trunk/Externals/cppunit/doc/header.html
trunk/Externals/cppunit/doc/other_documentation.dox
trunk/Externals/cppunit/examples/
trunk/Externals/cppunit/examples/ClockerPlugIn/
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerListener.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerListener.h
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerModel.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerModel.h
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerPlugIn.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerPlugIn.dsp
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerXmlHook.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/ClockerXmlHook.h
trunk/Externals/cppunit/examples/ClockerPlugIn/Makefile.am
trunk/Externals/cppunit/examples/ClockerPlugIn/Makefile.in
trunk/Externals/cppunit/examples/ClockerPlugIn/ReadMe.txt
trunk/Externals/cppunit/examples/ClockerPlugIn/Timer.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/Timer.h
trunk/Externals/cppunit/examples/ClockerPlugIn/WinNtTimer.cpp
trunk/Externals/cppunit/examples/ClockerPlugIn/WinNtTimer.h
trunk/Externals/cppunit/examples/DumperPlugIn/
trunk/Externals/cppunit/examples/DumperPlugIn/DumperListener.cpp
trunk/Externals/cppunit/examples/DumperPlugIn/DumperListener.h
trunk/Externals/cppunit/examples/DumperPlugIn/DumperPlugIn.cpp
trunk/Externals/cppunit/examples/DumperPlugIn/DumperPlugIn.dsp
trunk/Externals/cppunit/examples/DumperPlugIn/Makefile.am
trunk/Externals/cppunit/examples/DumperPlugIn/Makefile.in
trunk/Externals/cppunit/examples/Makefile.am
trunk/Externals/cppunit/examples/Makefile.in
trunk/Externals/cppunit/examples/cppunittest/
trunk/Externals/cppunit/examples/cppunittest/BaseTestCase.cpp
trunk/Externals/cppunit/examples/cppunittest/BaseTestCase.h
trunk/Externals/cppunit/examples/cppunittest/CoreSuite.h
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.cpp
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.dsp
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestMain.dsw
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestPlugIn.cpp
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestPlugIn.dsp
trunk/Externals/cppunit/examples/cppunittest/CppUnitTestSuite.cpp
trunk/Externals/cppunit/examples/cppunittest/ExceptionTest.cpp
trunk/Externals/cppunit/examples/cppunittest/ExceptionTest.h
trunk/Externals/cppunit/examples/cppunittest/ExceptionTestCaseDecoratorTest.cpp
trunk/Externals/cppunit/examples/cppunittest/ExceptionTestCaseDecoratorTest.h
trunk/Externals/cppunit/examples/cppunittest/ExtensionSuite.h
trunk/Externals/cppunit/examples/cppunittest/FailureException.h
trunk/Externals/cppunit/examples/cppunittest/HelperMacrosTest.cpp
trunk/Externals/cppunit/examples/cppunittest/HelperMacrosTest.h
trunk/Externals/cppunit/examples/cppunittest/HelperSuite.h
trunk/Externals/cppunit/examples/cppunittest/Makefile.am
trunk/Externals/cppunit/examples/cppunittest/Makefile.in
trunk/Externals/cppunit/examples/cppunittest/MessageTest.cpp
trunk/Externals/cppunit/examples/cppunittest/MessageTest.h
trunk/Externals/cppunit/examples/cppunittest/MockFunctor.h
trunk/Externals/cppunit/examples/cppunittest/MockProtector.h
trunk/Externals/cppunit/examples/cppunittest/MockTestCase.cpp
trunk/Externals/cppunit/examples/cppunittest/MockTestCase.h
trunk/Externals/cppunit/examples/cppunittest/MockTestListener.cpp
trunk/Externals/cppunit/examples/cppunittest/MockTestListener.h
trunk/Externals/cppunit/examples/cppunittest/OrthodoxTest.cpp
trunk/Externals/cppunit/examples/cppunittest/OrthodoxTest.h
trunk/Externals/cppunit/examples/cppunittest/OutputSuite.h
trunk/Externals/cppunit/examples/cppunittest/RepeatedTestTest.cpp
trunk/Externals/cppunit/examples/cppunittest/RepeatedTestTest.h
trunk/Externals/cppunit/examples/cppunittest/StringToolsTest.cpp
trunk/Externals/cppunit/examples/cppunittest/StringToolsTest.h
trunk/Externals/cppunit/examples/cppunittest/SubclassedTestCase.cpp
trunk/Externals/cppunit/examples/cppunittest/SubclassedTestCase.h
trunk/Externals/cppunit/examples/cppunittest/SynchronizedTestResult.h
trunk/Externals/cppunit/examples/cppunittest/TestAssertTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestAssertTest.h
trunk/Externals/cppunit/examples/cppunittest/TestCallerTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestCallerTest.h
trunk/Externals/cppunit/examples/cppunittest/TestCaseTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestCaseTest.h
trunk/Externals/cppunit/examples/cppunittest/TestDecoratorTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestDecoratorTest.h
trunk/Externals/cppunit/examples/cppunittest/TestFailureTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestFailureTest.h
trunk/Externals/cppunit/examples/cppunittest/TestPathTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestPathTest.h
trunk/Externals/cppunit/examples/cppunittest/TestResultCollectorTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestResultCollectorTest.h
trunk/Externals/cppunit/examples/cppunittest/TestResultTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestResultTest.h
trunk/Externals/cppunit/examples/cppunittest/TestSetUpTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestSetUpTest.h
trunk/Externals/cppunit/examples/cppunittest/TestSuiteTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestSuiteTest.h
trunk/Externals/cppunit/examples/cppunittest/TestTest.cpp
trunk/Externals/cppunit/examples/cppunittest/TestTest.h
trunk/Externals/cppunit/examples/cppunittest/ToolsSuite.h
trunk/Externals/cppunit/examples/cppunittest/TrackedTestCase.cpp
trunk/Externals/cppunit/examples/cppunittest/TrackedTestCase.h
trunk/Externals/cppunit/examples/cppunittest/UnitTestToolSuite.h
trunk/Externals/cppunit/examples/cppunittest/XmlElementTest.cpp
trunk/Externals/cppunit/examples/cppunittest/XmlElementTest.h
trunk/Externals/cppunit/examples/cppunittest/XmlOutputterTest.cpp
trunk/Externals/cppunit/examples/cppunittest/XmlOutputterTest.h
trunk/Externals/cppunit/examples/cppunittest/XmlUniformiser.cpp
trunk/Externals/cppunit/examples/cppunittest/XmlUniformiser.h
trunk/Externals/cppunit/examples/cppunittest/XmlUniformiserTest.cpp
trunk/Externals/cppunit/examples/cppunittest/XmlUniformiserTest.h
trunk/Externals/cppunit/examples/examples.dsw
trunk/Externals/cppunit/examples/examples.opt
trunk/Externals/cppunit/examples/hierarchy/
trunk/Externals/cppunit/examples/hierarchy/BoardGame.cpp
trunk/Externals/cppunit/examples/hierarchy/BoardGame.h
trunk/Externals/cppunit/examples/hierarchy/BoardGameTest.h
trunk/Externals/cppunit/examples/hierarchy/Chess.cpp
trunk/Externals/cppunit/examples/hierarchy/Chess.h
trunk/Externals/cppunit/examples/hierarchy/ChessTest.h
trunk/Externals/cppunit/examples/hierarchy/Makefile.am
trunk/Externals/cppunit/examples/hierarchy/Makefile.in
trunk/Externals/cppunit/examples/hierarchy/hierarchy.dsp
trunk/Externals/cppunit/examples/hierarchy/hierarchy.dsw
trunk/Externals/cppunit/examples/hierarchy/main.cpp
trunk/Externals/cppunit/examples/money/
trunk/Externals/cppunit/examples/money/Makefile.am
trunk/Externals/cppunit/examples/money/Makefile.in
trunk/Externals/cppunit/examples/money/Money.h
trunk/Externals/cppunit/examples/money/MoneyApp.cpp
trunk/Externals/cppunit/examples/money/MoneyTest.cpp
trunk/Externals/cppunit/examples/money/MoneyTest.h
trunk/Externals/cppunit/examples/money/StdAfx.cpp
trunk/Externals/cppunit/examples/money/StdAfx.h
trunk/Externals/cppunit/examples/money/configure.in
trunk/Externals/cppunit/examples/money/money.dsp
trunk/Externals/cppunit/examples/money/money.dsw
trunk/Externals/cppunit/examples/msvc6/
trunk/Externals/cppunit/examples/msvc6/.cvsignore
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/.cvsignore
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.h
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/ReadMe.txt
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/Resource.h
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/StdAfx.cpp
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/StdAfx.h
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.ico
trunk/Externals/cppunit/examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2
trunk/Externals/cppunit/examples/msvc6/HostApp/
trunk/Externals/cppunit/examples/msvc6/HostApp/.cvsignore
trunk/Externals/cppunit/examples/msvc6/HostApp/ExampleTestCase.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/ExampleTestCase.h
trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.dsp
trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.dsw
trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.h
trunk/Externals/cppunit/examples/msvc6/HostApp/HostApp.rc
trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppDoc.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppDoc.h
trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppView.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/HostAppView.h
trunk/Externals/cppunit/examples/msvc6/HostApp/MainFrm.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/MainFrm.h
trunk/Externals/cppunit/examples/msvc6/HostApp/Makefile.am
trunk/Externals/cppunit/examples/msvc6/HostApp/Resource.h
trunk/Externals/cppunit/examples/msvc6/HostApp/StdAfx.cpp
trunk/Externals/cppunit/examples/msvc6/HostApp/StdAfx.h
trunk/Externals/cppunit/examples/msvc6/HostApp/res/
trunk/Externals/cppunit/examples/msvc6/HostApp/res/.cvsignore
trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostApp.ico
trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostApp.rc2
trunk/Externals/cppunit/examples/msvc6/HostApp/res/HostAppDoc.ico
trunk/Externals/cppunit/examples/msvc6/HostApp/res/Makefile.am
trunk/Externals/cppunit/examples/msvc6/HostApp/res/Toolbar.bmp
trunk/Externals/cppunit/examples/msvc6/Makefile.am
trunk/Externals/cppunit/examples/msvc6/TestPlugIn/
trunk/Externals/cppunit/examples/msvc6/TestPlugIn/.cvsignore
trunk/Externals/cppunit/examples/qt/
trunk/Externals/cppunit/examples/qt/.cvsignore
trunk/Externals/cppunit/examples/qt/ExampleTestCases.cpp
trunk/Externals/cppunit/examples/qt/ExampleTestCases.h
trunk/Externals/cppunit/examples/qt/Main.cpp
trunk/Externals/cppunit/examples/qt/make_example
trunk/Externals/cppunit/examples/qt/make_example.bat
trunk/Externals/cppunit/examples/qt/qt_example.pro
trunk/Externals/cppunit/examples/qt/qt_example.sln
trunk/Externals/cppunit/examples/qt/qt_example.vcproj
trunk/Externals/cppunit/examples/qt/qt_example_dll.vcproj
trunk/Externals/cppunit/examples/qt/run.bat
trunk/Externals/cppunit/examples/simple/
trunk/Externals/cppunit/examples/simple/ExampleTestCase.cpp
trunk/Externals/cppunit/examples/simple/ExampleTestCase.h
trunk/Externals/cppunit/examples/simple/Main.cpp
trunk/Externals/cppunit/examples/simple/Makefile.am
trunk/Externals/cppunit/examples/simple/Makefile.in
trunk/Externals/cppunit/examples/simple/SimplePlugIn.cpp
trunk/Externals/cppunit/examples/simple/simple.dsp
trunk/Externals/cppunit/examples/simple/simple_plugin.dsp
trunk/Externals/cppunit/include/
trunk/Externals/cppunit/include/Makefile.am
trunk/Externals/cppunit/include/Makefile.in
trunk/Externals/cppunit/include/cppunit/
trunk/Externals/cppunit/include/cppunit/AdditionalMessage.h
trunk/Externals/cppunit/include/cppunit/Asserter.h
trunk/Externals/cppunit/include/cppunit/BriefTestProgressListener.h
trunk/Externals/cppunit/include/cppunit/CompilerOutputter.h
trunk/Externals/cppunit/include/cppunit/Exception.h
trunk/Externals/cppunit/include/cppunit/Makefile.am
trunk/Externals/cppunit/include/cppunit/Makefile.in
trunk/Externals/cppunit/include/cppunit/Message.h
trunk/Externals/cppunit/include/cppunit/Outputter.h
trunk/Externals/cppunit/include/cppunit/Portability.h
trunk/Externals/cppunit/include/cppunit/Protector.h
trunk/Externals/cppunit/include/cppunit/SourceLine.h
trunk/Externals/cppunit/include/cppunit/SynchronizedObject.h
trunk/Externals/cppunit/include/cppunit/Test.h
trunk/Externals/cppunit/include/cppunit/TestAssert.h
trunk/Externals/cppunit/include/cppunit/TestCaller.h
trunk/Externals/cppunit/include/cppunit/TestCase.h
trunk/Externals/cppunit/include/cppunit/TestComposite.h
trunk/Externals/cppunit/include/cppunit/TestFailure.h
trunk/Externals/cppunit/include/cppunit/TestFixture.h
trunk/Externals/cppunit/include/cppunit/TestLeaf.h
trunk/Externals/cppunit/include/cppunit/TestListener.h
trunk/Externals/cppunit/include/cppunit/TestPath.h
trunk/Externals/cppunit/include/cppunit/TestResult.h
trunk/Externals/cppunit/include/cppunit/TestResultCollector.h
trunk/Externals/cppunit/include/cppunit/TestRunner.h
trunk/Externals/cppunit/include/cppunit/TestSuccessListener.h
trunk/Externals/cppunit/include/cppunit/TestSuite.h
trunk/Externals/cppunit/include/cppunit/TextOutputter.h
trunk/Externals/cppunit/include/cppunit/TextTestProgressListener.h
trunk/Externals/cppunit/include/cppunit/TextTestResult.h
trunk/Externals/cppunit/include/cppunit/TextTestRunner.h
trunk/Externals/cppunit/include/cppunit/XmlOutputter.h
trunk/Externals/cppunit/include/cppunit/XmlOutputterHook.h
trunk/Externals/cppunit/include/cppunit/config/
trunk/Externals/cppunit/include/cppunit/config/CppUnitApi.h
trunk/Externals/cppunit/include/cppunit/config/Makefile.am
trunk/Externals/cppunit/include/cppunit/config/Makefile.in
trunk/Externals/cppunit/include/cppunit/config/SelectDllLoader.h
trunk/Externals/cppunit/include/cppunit/config/SourcePrefix.h
trunk/Externals/cppunit/include/cppunit/config/config-bcb5.h
trunk/Externals/cppunit/include/cppunit/config/config-evc4.h
trunk/Externals/cppunit/include/cppunit/config/config-mac.h
trunk/Externals/cppunit/include/cppunit/config/config-msvc6.h
trunk/Externals/cppunit/include/cppunit/extensions/
trunk/Externals/cppunit/include/cppunit/extensions/AutoRegisterSuite.h
trunk/Externals/cppunit/include/cppunit/extensions/ExceptionTestCaseDecorator.h
trunk/Externals/cppunit/include/cppunit/extensions/HelperMacros.h
trunk/Externals/cppunit/include/cppunit/extensions/Makefile.am
trunk/Externals/cppunit/include/cppunit/extensions/Makefile.in
trunk/Externals/cppunit/include/cppunit/extensions/Orthodox.h
trunk/Externals/cppunit/include/cppunit/extensions/RepeatedTest.h
trunk/Externals/cppunit/include/cppunit/extensions/TestCaseDecorator.h
trunk/Externals/cppunit/include/cppunit/extensions/TestDecorator.h
trunk/Externals/cppunit/include/cppunit/extensions/TestFactory.h
trunk/Externals/cppunit/include/cppunit/extensions/TestFactoryRegistry.h
trunk/Externals/cppunit/include/cppunit/extensions/TestFixtureFactory.h
trunk/Externals/cppunit/include/cppunit/extensions/TestNamer.h
trunk/Externals/cppunit/include/cppunit/extensions/TestSetUp.h
trunk/Externals/cppunit/include/cppunit/extensions/TestSuiteBuilderContext.h
trunk/Externals/cppunit/include/cppunit/extensions/TestSuiteFactory.h
trunk/Externals/cppunit/include/cppunit/extensions/TypeInfoHelper.h
trunk/Externals/cppunit/include/cppunit/plugin/
trunk/Externals/cppunit/include/cppunit/plugin/DynamicLibraryManager.h
trunk/Externals/cppunit/include/cppunit/plugin/DynamicLibraryManagerException.h
trunk/Externals/cppunit/include/cppunit/plugin/Makefile.am
trunk/Externals/cppunit/include/cppunit/plugin/Makefile.in
trunk/Externals/cppunit/include/cppunit/plugin/PlugInManager.h
trunk/Externals/cppunit/include/cppunit/plugin/PlugInParameters.h
trunk/Externals/cppunit/include/cppunit/plugin/TestPlugIn.h
trunk/Externals/cppunit/include/cppunit/plugin/TestPlugInDefaultImpl.h
trunk/Externals/cppunit/include/cppunit/portability/
trunk/Externals/cppunit/include/cppunit/portability/CppUnitDeque.h
trunk/Externals/cppunit/include/cppunit/portability/CppUnitMap.h
trunk/Externals/cppunit/include/cppunit/portability/CppUnitSet.h
trunk/Externals/cppunit/include/cppunit/portability/CppUnitStack.h
trunk/Externals/cppunit/include/cppunit/portability/CppUnitVector.h
trunk/Externals/cppunit/include/cppunit/portability/Makefile.am
trunk/Externals/cppunit/include/cppunit/portability/Makefile.in
trunk/Externals/cppunit/include/cppunit/portability/Stream.h
trunk/Externals/cppunit/include/cppunit/tools/
trunk/Externals/cppunit/include/cppunit/tools/Algorithm.h
trunk/Externals/cppunit/include/cppunit/tools/Makefile.am
trunk/Externals/cppunit/include/cppunit/tools/Makefile.in
trunk/Externals/cppunit/include/cppunit/tools/StringTools.h
trunk/Externals/cppunit/include/cppunit/tools/XmlDocument.h
trunk/Externals/cppunit/include/cppunit/tools/XmlElement.h
trunk/Externals/cppunit/include/cppunit/ui/
trunk/Externals/cppunit/include/cppunit/ui/Makefile.am
trunk/Externals/cppunit/include/cppunit/ui/Makefile.in
trunk/Externals/cppunit/include/cppunit/ui/mfc/
trunk/Externals/cppunit/include/cppunit/ui/mfc/Makefile.am
trunk/Externals/cppunit/include/cppunit/ui/mfc/Makefile.in
trunk/Externals/cppunit/include/cppunit/ui/mfc/MfcTestRunner.h
trunk/Externals/cppunit/include/cppunit/ui/mfc/TestRunner.h
trunk/Externals/cppunit/include/cppunit/ui/qt/
trunk/Externals/cppunit/include/cppunit/ui/qt/Config.h
trunk/Externals/cppunit/include/cppunit/ui/qt/Makefile.am
trunk/Externals/cppunit/include/cppunit/ui/qt/Makefile.in
trunk/Externals/cppunit/include/cppunit/ui/qt/QtTestRunner.h
trunk/Externals/cppunit/include/cppunit/ui/qt/TestRunner.h
trunk/Externals/cppunit/include/cppunit/ui/text/
trunk/Externals/cppunit/include/cppunit/ui/text/Makefile.am
trunk/Externals/cppunit/include/cppunit/ui/text/Makefile.in
trunk/Externals/cppunit/include/cppunit/ui/text/TestRunner.h
trunk/Externals/cppunit/include/cppunit/ui/text/TextTestRunner.h
trunk/Externals/cppunit/include/msvc6/
trunk/Externals/cppunit/include/msvc6/.cvsignore
trunk/Externals/cppunit/include/msvc6/DSPlugin/
trunk/Externals/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h
trunk/Externals/cppunit/include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c
trunk/Externals/cppunit/include/msvc6/testrunner/
trunk/Externals/cppunit/include/msvc6/testrunner/TestPlugInInterface.h
trunk/Externals/cppunit/include/msvc6/testrunner/TestRunner.h
trunk/Externals/cppunit/lib/
trunk/Externals/cppunit/src/
trunk/Externals/cppunit/src/CppUnitLibraries.dsw
trunk/Externals/cppunit/src/DllPlugInTester/
trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParser.cpp
trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParser.h
trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParserTest.cpp
trunk/Externals/cppunit/src/DllPlugInTester/CommandLineParserTest.h
trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTester.cpp
trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTester.dsp
trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTesterTest.cpp
trunk/Externals/cppunit/src/DllPlugInTester/DllPlugInTesterTest.dsp
trunk/Externals/cppunit/src/DllPlugInTester/Makefile.am
trunk/Externals/cppunit/src/DllPlugInTester/Makefile.in
trunk/Externals/cppunit/src/Makefile.am
trunk/Externals/cppunit/src/Makefile.in
trunk/Externals/cppunit/src/cppunit/
trunk/Externals/cppunit/src/cppunit/AdditionalMessage.cpp
trunk/Externals/cppunit/src/cppunit/Asserter.cpp
trunk/Externals/cppunit/src/cppunit/BeOsDynamicLibraryManager.cpp
trunk/Externals/cppunit/src/cppunit/BriefTestProgressListener.cpp
trunk/Externals/cppunit/src/cppunit/CompilerOutputter.cpp
trunk/Externals/cppunit/src/cppunit/DefaultProtector.cpp
trunk/Externals/cppunit/src/cppunit/DefaultProtector.h
trunk/Externals/cppunit/src/cppunit/DllMain.cpp
trunk/Externals/cppunit/src/cppunit/DynamicLibraryManager.cpp
trunk/Externals/cppunit/src/cppunit/DynamicLibraryManagerException.cpp
trunk/Externals/cppunit/src/cppunit/Exception.cpp
trunk/Externals/cppunit/src/cppunit/Makefile.am
trunk/Externals/cppunit/src/cppunit/Makefile.in
trunk/Externals/cppunit/src/cppunit/Message.cpp
trunk/Externals/cppunit/src/cppunit/PlugInManager.cpp
trunk/Externals/cppunit/src/cppunit/PlugInParameters.cpp
trunk/Externals/cppunit/src/cppunit/Protector.cpp
trunk/Externals/cppunit/src/cppunit/ProtectorChain.cpp
trunk/Externals/cppunit/src/cppunit/ProtectorChain.h
trunk/Externals/cppunit/src/cppunit/ProtectorContext.h
trunk/Externals/cppunit/src/cppunit/RepeatedTest.cpp
trunk/Externals/cppunit/src/cppunit/ShlDynamicLibraryManager.cpp
trunk/Externals/cppunit/src/cppunit/SourceLine.cpp
trunk/Externals/cppunit/src/cppunit/StringTools.cpp
trunk/Externals/cppunit/src/cppunit/SynchronizedObject.cpp
trunk/Externals/cppunit/src/cppunit/Test.cpp
trunk/Externals/cppunit/src/cppunit/TestAssert.cpp
trunk/Externals/cppunit/src/cppunit/TestCase.cpp
trunk/Externals/cppunit/src/cppunit/TestCaseDecorator.cpp
trunk/Externals/cppunit/src/cppunit/TestComposite.cpp
trunk/Externals/cppunit/src/cppunit/TestDecorator.cpp
trunk/Externals/cppunit/src/cppunit/TestFactoryRegistry.cpp
trunk/Externals/cppunit/src/cppunit/TestFailure.cpp
trunk/Externals/cppunit/src/cppunit/TestLeaf.cpp
trunk/Externals/cppunit/src/cppunit/TestNamer.cpp
trunk/Externals/cppunit/src/cppunit/TestPath.cpp
trunk/Externals/cppunit/src/cppunit/TestPlugInDefaultImpl.cpp
trunk/Externals/cppunit/src/cppunit/TestResult.cpp
trunk/Externals/cppunit/src/cppunit/TestResultCollector.cpp
trunk/Externals/cppunit/src/cppunit/TestRunner.cpp
trunk/Externals/cppunit/src/cppunit/TestSetUp.cpp
trunk/Externals/cppunit/src/cppunit/TestSuccessListener.cpp
trunk/Externals/cppunit/src/cppunit/TestSuite.cpp
trunk/Externals/cppunit/src/cppunit/TestSuiteBuilderContext.cpp
trunk/Externals/cppunit/src/cppunit/TextOutputter.cpp
trunk/Externals/cppunit/src/cppunit/TextTestProgressListener.cpp
trunk/Externals/cppunit/src/cppunit/TextTestResult.cpp
trunk/Externals/cppunit/src/cppunit/TextTestRunner.cpp
trunk/Externals/cppunit/src/cppunit/TypeInfoHelper.cpp
trunk/Externals/cppunit/src/cppunit/UnixDynamicLibraryManager.cpp
trunk/Externals/cppunit/src/cppunit/Win32DynamicLibraryManager.cpp
trunk/Externals/cppunit/src/cppunit/XmlDocument.cpp
trunk/Externals/cppunit/src/cppunit/XmlElement.cpp
trunk/Externals/cppunit/src/cppunit/XmlOutputter.cpp
trunk/Externals/cppunit/src/cppunit/XmlOutputterHook.cpp
trunk/Externals/cppunit/src/cppunit/cppunit.dsp
trunk/Externals/cppunit/src/cppunit/cppunit_dll.dsp
trunk/Externals/cppunit/src/msvc6/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/.cvsignore
trunk/Externals/cppunit/src/msvc6/DSPlugIn/COMHelper.h
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSAddIn.cpp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSAddIn.h
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.cpp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.def
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.dsp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.h
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.rc
trunk/Externals/cppunit/src/msvc6/DSPlugIn/DSPlugIn.rgs
trunk/Externals/cppunit/src/msvc6/DSPlugIn/ReadMe.txt
trunk/Externals/cppunit/src/msvc6/DSPlugIn/StdAfx.cpp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/StdAfx.h
trunk/Externals/cppunit/src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/DSPlugIn.rc2
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/TBarLrge.bmp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/res/TBarMedm.bmp
trunk/Externals/cppunit/src/msvc6/DSPlugIn/resource.h
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/.cvsignore
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/DllPlugInTester.cpp
trunk/Externals/cppunit/src/msvc6/DllPlugInTester/DllPlugInTester.dsp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/.cvsignore
trunk/Externals/cppunit/src/msvc6/testpluginrunner/ReadMe.txt
trunk/Externals/cppunit/src/msvc6/testpluginrunner/Resource.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/StdAfx.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/StdAfx.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugIn.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugIn.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInException.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInException.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunner.dsp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunner.rc
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerApp.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerApp.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerDlg.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerModel.cpp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/TestPlugInRunnerModel.h
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/TestPlugInRunner.ico
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/TestPlugInRunner.rc2
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/errortype.bmp
trunk/Externals/cppunit/src/msvc6/testpluginrunner/res/test_type.bmp
trunk/Externals/cppunit/src/msvc6/testrunner/
trunk/Externals/cppunit/src/msvc6/testrunner/.cvsignore
trunk/Externals/cppunit/src/msvc6/testrunner/ActiveTest.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/ActiveTest.h
trunk/Externals/cppunit/src/msvc6/testrunner/Change-Diary-ResourceBugFix.txt
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/SizeCBar.html
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicBar.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicControlsManager.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicDialog.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicFormView.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicPropSheet.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWnd.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCDynamicWndEx.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/cdxCSizeIconCtrl.h
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-big.gif
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC-small.gif
trunk/Externals/cppunit/src/msvc6/testrunner/DynamicWindow/doc/cdxCDynamicWnd-DOC.html
trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlFormatter.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlFormatter.h
trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlSetter.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/ListCtrlSetter.h
trunk/Externals/cppunit/src/msvc6/testrunner/MfcSynchronizationObject.h
trunk/Externals/cppunit/src/msvc6/testrunner/MfcTestRunner.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/MostRecentTests.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/MostRecentTests.h
trunk/Externals/cppunit/src/msvc6/testrunner/MsDevCallerListCtrl.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/MsDevCallerListCtrl.h
trunk/Externals/cppunit/src/msvc6/testrunner/ProgressBar.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/ProgressBar.h
trunk/Externals/cppunit/src/msvc6/testrunner/Resource.h
trunk/Externals/cppunit/src/msvc6/testrunner/ResourceLoaders.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/ResourceLoaders.h
trunk/Externals/cppunit/src/msvc6/testrunner/StdAfx.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/StdAfx.h
trunk/Externals/cppunit/src/msvc6/testrunner/SynchronizedTestResult.h
trunk/Externals/cppunit/src/msvc6/testrunner/TestResultDecorator.h
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.def
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.dsp
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunner.rc
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerApp.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerApp.h
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerDlg.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerDlg.h
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerModel.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/TestRunnerModel.h
trunk/Externals/cppunit/src/msvc6/testrunner/TreeHierarchyDlg.cpp
trunk/Externals/cppunit/src/msvc6/testrunner/TreeHierarchyDlg.h
trunk/Externals/cppunit/src/msvc6/testrunner/res/
trunk/Externals/cppunit/src/msvc6/testrunner/res/TestRunner.rc2
trunk/Externals/cppunit/src/msvc6/testrunner/res/errortype.bmp
trunk/Externals/cppunit/src/msvc6/testrunner/res/test_type.bmp
trunk/Externals/cppunit/src/qttestrunner/
trunk/Externals/cppunit/src/qttestrunner/.cvsignore
trunk/Externals/cppunit/src/qttestrunner/MostRecentTests.cpp
trunk/Externals/cppunit/src/qttestrunner/MostRecentTests.h
trunk/Externals/cppunit/src/qttestrunner/QtTestRunner.cpp
trunk/Externals/cppunit/src/qttestrunner/TestBrowserDlgImpl.cpp
trunk/Externals/cppunit/src/qttestrunner/TestBrowserDlgImpl.h
trunk/Externals/cppunit/src/qttestrunner/TestFailureInfo.cpp
trunk/Externals/cppunit/src/qttestrunner/TestFailureInfo.h
trunk/Externals/cppunit/src/qttestrunner/TestFailureListViewItem.cpp
trunk/Externals/cppunit/src/qttestrunner/TestFailureListViewItem.h
trunk/Externals/cppunit/src/qttestrunner/TestListViewItem.cpp
trunk/Externals/cppunit/src/qttestrunner/TestListViewItem.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerDlgImpl.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerDlgImpl.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerFailureEvent.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerFailureEvent.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerModel.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerModel.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerModelThreadInterface.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerModelThreadInterface.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerTestCaseRunEvent.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThread.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThread.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadEvent.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadEvent.h
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp
trunk/Externals/cppunit/src/qttestrunner/TestRunnerThreadFinishedEvent.h
trunk/Externals/cppunit/src/qttestrunner/make_lib
trunk/Externals/cppunit/src/qttestrunner/make_lib.bat
trunk/Externals/cppunit/src/qttestrunner/qttestrunner.vcproj
trunk/Externals/cppunit/src/qttestrunner/qttestrunner_dll.vcproj
trunk/Externals/cppunit/src/qttestrunner/qttestrunnerlib.pro
trunk/Externals/cppunit/src/qttestrunner/testbrowserdlg.ui
trunk/Externals/cppunit/src/qttestrunner/testrunnerdlg.ui
Added: trunk/Externals/cppunit/AUTHORS
===================================================================
--- trunk/Externals/cppunit/AUTHORS (rev 0)
+++ trunk/Externals/cppunit/AUTHORS 2006-10-27 15:07:00 UTC (rev 3733)
@@ -0,0 +1,6 @@
+Michael Feathers <mfe...@ob...>
+Jerome Lacoste <lac...@al...>
+E. Sommerlade <er...@so...>
+Baptiste Lepilleur <gai...@fr...> <bl...@so...>
+Bastiaan Bakker <bas...@li...>
+Steve Robbins <sm...@so...>
Added: trunk/Externals/cppunit/BUGS
===================================================================
--- trunk/Externals/cppunit/BUGS (rev 0)
+++ trunk/Externals/cppunit/BUGS 2006-10-27 15:07:00 UTC (rev 3733)
@@ -0,0 +1,6 @@
+ KNOWN BUGS
+ ----------
+
+The handling of html and man pages in doc/Makefile.am is
+flawed. It will not pass "make distcheck".
+
Added: trunk/Externals/cppunit/COPYING
===================================================================
--- trunk/Externals/cppunit/COPYING (rev 0)
+++ trunk/Externals/cppunit/COPYING 2006-10-27 15:07:00 UTC (rev 3733)
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this L...
[truncated message content] |
|
From: <ga...@us...> - 2006-10-26 12:58:47
|
Revision: 3732
http://svn.sourceforge.net/winmerge/?rev=3732&view=rev
Author: galh
Date: 2006-10-26 05:58:37 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme.
Modified Paths:
--------------
trunk/Src/BCMenu.cpp
trunk/Src/Changes.txt
Modified: trunk/Src/BCMenu.cpp
===================================================================
--- trunk/Src/BCMenu.cpp 2006-10-24 21:26:39 UTC (rev 3731)
+++ trunk/Src/BCMenu.cpp 2006-10-26 12:58:37 UTC (rev 3732)
@@ -659,7 +659,7 @@
else{
BOOL standardflag=FALSE,selectedflag=FALSE,disableflag=FALSE;
BOOL checkflag=FALSE;
- COLORREF crText = GetSysColor(COLOR_MENUTEXT);
+ COLORREF crText = RGB(0, 0, 0); // Original was GetSysColor(COLOR_MENUTEXT);
COLORREF crSelect = GetSysColor(COLOR_HIGHLIGHT);
COLORREF crSelectFill;
if(!IsWinXPLuna())crSelectFill=LightenColor(crSelect,0.85);
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-24 21:26:39 UTC (rev 3731)
+++ trunk/Src/Changes.txt 2006-10-26 12:58:37 UTC (rev 3732)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-26 Gal
+ BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
+ Src/: BCMenu.cpp
+
2006-10-24 Tim
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Src/res deleted file: Toolbar.bmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-24 21:26:52
|
Revision: 3731
http://svn.sourceforge.net/winmerge/?rev=3731&view=rev
Author: gerundt
Date: 2006-10-24 14:26:39 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
Removed Paths:
-------------
branches/R2_6/Src/res/Toolbar.bmp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-24 21:23:22 UTC (rev 3730)
+++ branches/R2_6/Src/Changes.txt 2006-10-24 21:26:39 UTC (rev 3731)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-24 Tim
+ PATCH: [ 1584004 ] Delete "Toolbar.bmp"
+ Src/res deleted file: Toolbar.bmp
+
2006-10-12 2.6.0 Stable Release (R3712)
2006-10-12 Kimmo
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2006-10-24 21:23:22 UTC (rev 3730)
+++ branches/R2_6/Src/Merge.dsp 2006-10-24 21:26:39 UTC (rev 3731)
@@ -1665,10 +1665,6 @@
# End Source File
# Begin Source File
-SOURCE=.\res\Toolbar.bmp
-# End Source File
-# Begin Source File
-
SOURCE=.\res\unknown.bmp
# End Source File
# Begin Source File
Deleted: branches/R2_6/Src/res/Toolbar.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-24 21:23:31
|
Revision: 3730
http://svn.sourceforge.net/winmerge/?rev=3730&view=rev
Author: gerundt
Date: 2006-10-24 14:23:22 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
PATCH: [ 1584004 ] Delete "Toolbar.bmp"
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/Merge.dsp
Removed Paths:
-------------
trunk/Src/res/Toolbar.bmp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-23 21:24:05 UTC (rev 3729)
+++ trunk/Src/Changes.txt 2006-10-24 21:23:22 UTC (rev 3730)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-24 Tim
+ PATCH: [ 1584004 ] Delete "Toolbar.bmp"
+ Src/res deleted file: Toolbar.bmp
+
2006-10-20 Kimmo
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Src: MainFrm.cpp
Modified: trunk/Src/Merge.dsp
===================================================================
--- trunk/Src/Merge.dsp 2006-10-23 21:24:05 UTC (rev 3729)
+++ trunk/Src/Merge.dsp 2006-10-24 21:23:22 UTC (rev 3730)
@@ -1665,10 +1665,6 @@
# End Source File
# Begin Source File
-SOURCE=.\res\Toolbar.bmp
-# End Source File
-# Begin Source File
-
SOURCE=.\res\unknown.bmp
# End Source File
# Begin Source File
Deleted: trunk/Src/res/Toolbar.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-23 21:24:17
|
Revision: 3729
http://svn.sourceforge.net/winmerge/?rev=3729&view=rev
Author: gerundt
Date: 2006-10-23 14:24:05 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-20 21:10:25 UTC (rev 3728)
+++ trunk/Web/Changes.txt 2006-10-23 21:24:05 UTC (rev 3729)
@@ -1,3 +1,7 @@
+2006-10-23 Tim
+ BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
+ Web: WinMergePAD.php
+
2006-10-18 Tim
BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
Web: WinMergePAD.xml
Modified: trunk/Web/WinMergePAD.php
===================================================================
--- trunk/Web/WinMergePAD.php 2006-10-20 21:10:25 UTC (rev 3728)
+++ trunk/Web/WinMergePAD.php 2006-10-23 21:24:05 UTC (rev 3729)
@@ -6,7 +6,7 @@
?>
<h2>PAD file</h2>
<p>The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href="http://www.asp-shareware.org/pad/">Portable Application Description</a> file, which you find here:</p>
-<pre class="code"><a href="http://www.winmerge.org/WinMergePAD.xml">http://www.winmerge.org/WinMergePAD.xml</a></pre>
+<pre class="code"><a href="http://winmerge.org/WinMergePAD.xml">http://winmerge.org/WinMergePAD.xml</a></pre>
<p>If you can't work with the <a href="WinMergePAD.xml">PAD file</a>, you can use the following informations:</p>
<?php
$padfile = $page->convertXml2Array('WinMergePAD.xml');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 21:10:41
|
Revision: 3728
http://svn.sourceforge.net/winmerge/?rev=3728&view=rev
Author: kimmov
Date: 2006-10-20 14:10:25 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Fix casting a pointer type to DWORD (not 64-bit compatible)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
trunk/Src/DirView.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/Changes.txt 2006-10-20 21:10:25 UTC (rev 3728)
@@ -7,6 +7,8 @@
Src: MainFrm.cpp
Remove unused function, fix inproper pointer usage
Src: FileFilterHelper.cpp
+ Fix casting a pointer type to DWORD (not 64-bit compatible)
+ Src: DirView.cpp DirView.h
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/DirView.cpp 2006-10-20 21:10:25 UTC (rev 3728)
@@ -633,8 +633,11 @@
AfxGetMainWnd());
}
-/** @brief Convert number to string, with commas
-between digits in locale-appropriate manner */
+/**
+ * @brief Convert number to string.
+ * Converts number to string, with commas between digits in
+ * locale-appropriate manner.
+*/
CString NumToStr(int n)
{
CString s = locality::NumToLocaleStr(n);
@@ -815,7 +818,7 @@
m_ctlSortHeader.SetSortImage(ColLogToPhys(sortCol), bSortAscending);
//sort using static CompareFunc comparison function
CompareState cs(this, sortCol, bSortAscending);
- GetListCtrl().SortItems(cs.CompareFunc, reinterpret_cast<DWORD>(&cs));
+ GetListCtrl().SortItems(cs.CompareFunc, reinterpret_cast<DWORD_PTR>(&cs));
}
/// Do any last minute work as view closes
@@ -1340,8 +1343,9 @@
}
/**
- * @brief Get keydata associated with item in given index
- * @param idx Item's index to list in UI
+ * @brief Get keydata associated with item in given index.
+ * @param [in] idx Item's index to list in UI.
+ * @return Key for item in given index.
*/
POSITION CDirView::GetItemKey(int idx) const
{
@@ -1350,13 +1354,23 @@
// SetItemKey & GetItemKey encapsulate how the display list items
// are mapped to DiffItems, which in turn are DiffContext keys to the actual DIFFITEM data
-POSITION CDirView::GetItemKeyFromData(DWORD dw) const
+
+/**
+ * @brief Convert item's data to item's key.
+ * Use this function to get item's key when item's data is known.
+ * @param [in] dw Item's data.
+ * @return Item's key.
+ */
+POSITION CDirView::GetItemKeyFromData(DWORD_PTR dw) const
{
return (POSITION)dw;
}
/**
- * Given index in list control, get its associated DIFFITEM data
+ * @brief Get DIFFITEM data for item.
+ * This function returns DIFFITEM data for item in given index in GUI.
+ * @param [in] sel Item's index in folder compare GUI list.
+ * @return DIFFITEM for item.
*/
DIFFITEM CDirView::GetDiffItem(int sel) const
{
Modified: trunk/Src/DirView.h
===================================================================
--- trunk/Src/DirView.h 2006-10-20 16:50:30 UTC (rev 3727)
+++ trunk/Src/DirView.h 2006-10-20 21:10:25 UTC (rev 3728)
@@ -396,7 +396,7 @@
void DoUpdateCtxtDirCopyRightTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveLeftTo(CCmdUI* pCmdUI);
void DoUpdateCtxtDirMoveRightTo(CCmdUI* pCmdUI);
- POSITION GetItemKeyFromData(DWORD dw) const;
+ POSITION GetItemKeyFromData(DWORD_PTR dw) const;
DIFFITEM GetDiffItem(int sel) const;
DIFFITEM & GetDiffItemRef(int sel);
const DIFFITEM & GetDiffItemConstRef(int sel) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 16:50:36
|
Revision: 3727
http://svn.sourceforge.net/winmerge/?rev=3727&view=rev
Author: kimmov
Date: 2006-10-20 09:50:30 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Remove unused function, fix inproper pointer usage
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/FileFilterHelper.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-20 16:01:51 UTC (rev 3726)
+++ trunk/Src/Changes.txt 2006-10-20 16:50:30 UTC (rev 3727)
@@ -5,6 +5,8 @@
2006-10-20 Kimmo
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Src: MainFrm.cpp
+ Remove unused function, fix inproper pointer usage
+ Src: FileFilterHelper.cpp
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified: trunk/Src/FileFilterHelper.cpp
===================================================================
--- trunk/Src/FileFilterHelper.cpp 2006-10-20 16:01:51 UTC (rev 3726)
+++ trunk/Src/FileFilterHelper.cpp 2006-10-20 16:50:30 UTC (rev 3727)
@@ -407,15 +407,15 @@
FILEFILTER_INFOLIST filters;
FileInfo fileInfo;
FileInfo *fileInfoStored = NULL;
- FileFilterInfo * filter = NULL;
+ FileFilterInfo filter;
CString selected;
GetFileFilters(&filters, selected);
for (int i = 0; i < filters.GetSize(); i++)
{
- filter = &filters.GetAt(i);
- CString path = filter->fullpath;
- fileInfoStored = &filter->fileinfo;
+ filter = filters.GetAt(i);
+ CString path = filter.fullpath;
+ fileInfoStored = &filter.fileinfo;
fileInfo.Update(path);
if (fileInfo.mtime != fileInfoStored->mtime ||
@@ -435,21 +435,6 @@
}
/**
- * @ brief Returns true if directory exists or successfully created
- * Tries to create multiple directories if needed
- */
-static bool
-EnsureDirectoryExists(const CString & sPath)
-{
- // paths_CanUse will
- if (paths_CreateIfNeeded(sPath))
- return true;
- else
- return false;
-
-}
-
-/**
* @brief Load any known file filters
* @todo Preserve filter selection? How?
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-20 16:01:58
|
Revision: 3726
http://svn.sourceforge.net/winmerge/?rev=3726&view=rev
Author: kimmov
Date: 2006-10-20 09:01:51 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 22:19:17 UTC (rev 3725)
+++ trunk/Src/Changes.txt 2006-10-20 16:01:51 UTC (rev 3726)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-20 Kimmo
+ Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
+ Src: MainFrm.cpp
+
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Src: MainFrm.cpp MainFrm.h
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-19 22:19:17 UTC (rev 3725)
+++ trunk/Src/MainFrm.cpp 2006-10-20 16:01:51 UTC (rev 3726)
@@ -609,7 +609,6 @@
PackingInfo * infoUnpacker /*= NULL*/)
{
BOOL docNull;
- BOOL bOpenSuccess = FALSE;
CMergeDoc * pMergeDoc = GetMergeDocToShow(pDirDoc, &docNull);
// Make local copies, so we can change encoding if we guess it below
@@ -949,8 +948,6 @@
while (!docs.IsEmpty())
{
CMergeDoc * pMergeDoc = docs.RemoveHead();
- CMergeEditView * pLeft = pMergeDoc->GetLeftView();
- CMergeEditView * pRight = pMergeDoc->GetRightView();
// Re-read MergeDoc settings (also updates view settings)
// and rescan using new options
@@ -1237,15 +1234,6 @@
}
/**
- * @brief Trim trailing line returns.
- */
-static void RemoveLineReturns(CString & str)
-{
- str.Remove('\n');
- str.Remove('\r');
-}
-
-/**
* @brief Sync file to Version Control System
* @param pszSrc [in] File to copy
* @param pszDest [in] Where to copy (incl. filename)
@@ -1254,6 +1242,7 @@
* @return User selection or -1 if error happened
* @sa CMainFrame::HandleReadonlySave()
* @sa CDirView::PerformActionList()
+ * @todo Parameter @p pszSrc is ununsed.
*/
int CMainFrame::SyncFileToVCS(LPCTSTR pszSrc, LPCTSTR pszDest,
BOOL &bApplyToAll, CString *psError)
@@ -1299,7 +1288,6 @@
CString sFontPath = fileFontPath; // Default to change file compare font
CFrameWnd * pFrame = GetActiveFrame();
- BOOL bMergeFrame = pFrame->IsKindOf(RUNTIME_CLASS(CChildFrame));
BOOL bDirFrame = pFrame->IsKindOf(RUNTIME_CLASS(CDirFrame));
if (bDirFrame)
@@ -1566,7 +1554,7 @@
q.pszWindow = NULL;
q.cbStruct = sizeof(q);
- ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_SEARCH, (DWORD)&q);
+ ::HtmlHelp(GetSafeHwnd(), sPath, HH_DISPLAY_SEARCH, (DWORD_PTR)&q);
}
else
ShellExecute(NULL, _T("open"), DocsURL, NULL, NULL, SW_SHOWNORMAL);
@@ -1711,7 +1699,6 @@
USES_CONVERSION;
TCHAR tmp[_MAX_PATH] = {0};
- TCHAR tokenStr[_MAX_PATH] = {0};
TCHAR* token;
TCHAR sep[] = _T("\r\n");
BOOL valid = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 22:19:23
|
Revision: 3725
http://svn.sourceforge.net/winmerge/?rev=3725&view=rev
Author: kimmov
Date: 2006-10-19 15:19:17 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Fix misuse of reference parameters (compiler warning)
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/DirView.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 21:05:41 UTC (rev 3724)
+++ trunk/Src/Changes.txt 2006-10-19 22:19:17 UTC (rev 3725)
@@ -7,6 +7,8 @@
Src: MainFrm.cpp MainFrm.h
Trivial type fixes, coding style fixes and converting comments to doxygen
Src: StdAfx.cpp StdAfx.h
+ Fix misuse of reference parameters (compiler warning)
+ Src: DirView.cpp
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified: trunk/Src/DirView.cpp
===================================================================
--- trunk/Src/DirView.cpp 2006-10-19 21:05:41 UTC (rev 3724)
+++ trunk/Src/DirView.cpp 2006-10-19 22:19:17 UTC (rev 3725)
@@ -382,8 +382,9 @@
DeleteAllDisplayItems();
// If non-recursive compare, add special item(s)
+ CString leftParent, rightParent;
if (!pDoc->GetRecursive() ||
- pDoc->AllowUpwardDirectory(CString(), CString()) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
+ pDoc->AllowUpwardDirectory(leftParent, rightParent) == CDirDoc::AllowUpwardDirectory::ParentIsTempPath)
{
cnt += AddSpecialItems();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 21:05:50
|
Revision: 3724
http://svn.sourceforge.net/winmerge/?rev=3724&view=rev
Author: kimmov
Date: 2006-10-19 14:05:41 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Trivial type fixes, coding style fixes and converting comments to doxygen
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/StdAfx.cpp
trunk/Src/StdAfx.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/Changes.txt 2006-10-19 21:05:41 UTC (rev 3724)
@@ -5,6 +5,8 @@
2006-10-19 Kimmo
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Src: MainFrm.cpp MainFrm.h
+ Trivial type fixes, coding style fixes and converting comments to doxygen
+ Src: StdAfx.cpp StdAfx.h
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified: trunk/Src/StdAfx.cpp
===================================================================
--- trunk/Src/StdAfx.cpp 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/StdAfx.cpp 2006-10-19 21:05:41 UTC (rev 3724)
@@ -43,7 +43,7 @@
// This is ok for the UNICODE build because UCS-2LE code bytes
// do not extend as high as 2Gig (actually even full Unicode
// codepoints don't extend that high).
-int normch(int c)
+static wint_t normch(wint_t c)
{
#ifdef _UNICODE
return (unsigned short)(short)c;
@@ -52,38 +52,44 @@
#endif
}
-// Returns nonzero if input is outside ASCII or is underline
-int
-xisspecial (int c)
+/** @brief Return nonzero if input is outside ASCII or is underline. */
+int xisspecial (wint_t c)
{
return normch(c) > (unsigned) _T ('\x7f') || c == _T ('_');
}
-// Returns non-zero if input is alphabetic or "special" (see xisspecial)
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisalpha (int c)
+/**
+ * @brief Return non-zero if input is alphabetic or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalpha (wint_t c)
{
return _istalpha (normch(c)) || xisspecial (normch(c));
}
-// Returns non-zero if input is alphanumeric or "special" (see xisspecial)
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisalnum (int c)
+/**
+ * @brief Return non-zero if input is alphanumeric or "special" (see xisspecial).
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisalnum (wint_t c)
{
return _istalnum (normch(c)) || xisspecial (normch(c));
}
-// Returns non-zero if input character is a space
-// Also converts any negative inputs to negative char equivalents (see normch)
-int
-xisspace (int c)
+/**
+ * @brief Return non-zero if input character is a space.
+ * Also converts any negative inputs to negative char equivalents (see normch).
+ */
+int xisspace (wint_t c)
{
return _istspace (normch(c));
}
-// Load string resource and return as CString
+/**
+ * @brief Load string resource and return as CString.
+ * @param [in] id Resource string ID.
+ * @return Resource string as CString.
+ */
CString LoadResString(int id)
{
CString s;
@@ -91,13 +97,20 @@
return s;
}
-// Combines AfxFormatString1 with AfxMessageBox
-int
-ResMsgBox1(int msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
+/**
+ * @brief Show messagebox with resource string having parameter.
+ * @param [in] msgid Resource string ID.
+ * @param [in] arg Argument string.
+ * @param [in] nType Messagebox type flags (e.g. MB_OK).
+ * @param [in] nIDHelp Help string ID.
+ * @return User choice from the messagebox (see MessageBox()).
+ */
+int ResMsgBox1(int msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
{
CString msg;
AfxFormatString1(msg, msgid, arg);
- if (!nIDHelp) nIDHelp = msgid;
+ if (!nIDHelp)
+ nIDHelp = msgid;
return AfxMessageBox(msg, nType, nIDHelp);
}
Modified: trunk/Src/StdAfx.h
===================================================================
--- trunk/Src/StdAfx.h 2006-10-19 20:09:15 UTC (rev 3723)
+++ trunk/Src/StdAfx.h 2006-10-19 21:05:41 UTC (rev 3724)
@@ -70,10 +70,10 @@
// Miscellaneous functions defined in StdAfx.cpp
-int xisspecial (int c);
-int xisalpha (int c);
-int xisalnum (int c);
-int xisspace (int c);
+int xisspecial (wint_t c);
+int xisalpha (wint_t c);
+int xisalnum (wint_t c);
+int xisspace (wint_t c);
/** @brief Load string from string resources; shortcut for CString::LoadString */
CString LoadResString(int id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
