From a6ac93838e92ecf8d15030e68e3664fb6182086f Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sun, 11 Feb 2007 21:34:43 +0000 Subject: [PATCH] Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar()) --- Src/Changes.txt | 4 ++++ Src/MainFrm.cpp | 12 ++++++------ Src/PropBackups.cpp | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Src/Changes.txt b/Src/Changes.txt index 77b1e2efc..6a40f8915 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -2,6 +2,10 @@ Src\Changes.txt Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2007-02-11 Kimmo + Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar()) + Src: MainFrm.cpp PropBackups.cpp + 2007-02-10 Kimmo PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4 Submitted by dr_prozac diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index c57486b83..66f999066 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -1242,7 +1242,7 @@ BOOL CMainFrame::CreateBackup(BOOL bFolder, LPCTSTR pszPath) } if (bakPath[bakPath.GetLength() - 1] != '\\') - bakPath.AppendChar('\\'); + bakPath += "\\"; BOOL success = FALSE; if (GetOptionsMgr()->GetBool(OPT_BACKUP_ADD_BAK)) @@ -1257,8 +1257,8 @@ BOOL CMainFrame::CreateBackup(BOOL bFolder, LPCTSTR pszPath) time(&curtime); CString timestr; timestr.Format(_T("%d"), curtime); - filename.AppendChar('-'); - filename.Append(timestr); + filename += "-"; + filename += timestr; } // Append filename and extension (+ optional .bak) to path @@ -1266,9 +1266,9 @@ BOOL CMainFrame::CreateBackup(BOOL bFolder, LPCTSTR pszPath) < MAX_PATH) { success = TRUE; - bakPath.Append(filename); - bakPath.AppendChar('.'); - bakPath.Append(ext); + bakPath += filename; + bakPath += "."; + bakPath += ext; } if (success) diff --git a/Src/PropBackups.cpp b/Src/PropBackups.cpp index 58c1a8924..2187536bc 100644 --- a/Src/PropBackups.cpp +++ b/Src/PropBackups.cpp @@ -82,7 +82,7 @@ void CPropBackups::WriteOptions() m_sGlobalFolder.TrimLeft(); m_sGlobalFolder.TrimRight(); if (m_sGlobalFolder[m_sGlobalFolder.GetLength() - 1] != '\\') - m_sGlobalFolder.AppendChar('\\'); + m_sGlobalFolder += "\\"; m_pOptionsMgr->SaveOption(OPT_BACKUP_FOLDERCMP, m_bCreateForFolderCmp == TRUE); m_pOptionsMgr->SaveOption(OPT_BACKUP_FILECMP, m_bCreateForFileCmp == TRUE); -- 2.11.0