Index: src/ch/FeedbackReplaceDlg.cpp
===================================================================
diff -u -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1 -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e
--- src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
+++ src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e)
@@ -3,22 +3,21 @@
 
 #include "stdafx.h"
 #include "ch.h"
-#include "../libchcore/TFileInfo.h"
 #include "FeedbackReplaceDlg.h"
 #include "../libictranslate/ResourceManager.h"
-#include "../libchcore/TFileInfo.h"
 #include "FeedbackHandler.h"
 #include "resource.h"
+#include "../libchengine/TFileInfo.h"
 
 // CFeedbackReplaceDlg dialog
 
 IMPLEMENT_DYNAMIC(CFeedbackReplaceDlg, ictranslate::CLanguageDialog)
 
-CFeedbackReplaceDlg::CFeedbackReplaceDlg(const chcore::TFileInfo& spSrcFile, const chcore::TFileInfo& spDstFile, CWnd* pParent /*=nullptr*/)
+CFeedbackReplaceDlg::CFeedbackReplaceDlg(const chengine::TFileInfo& spSrcFile, const chengine::TFileInfo& spDstFile, CWnd* pParent /*=nullptr*/)
 	: ictranslate::CLanguageDialog(IDD_FEEDBACK_REPLACE_DIALOG, pParent),
+	m_bAllItems(FALSE),
 	m_rSrcFile(spSrcFile),
-	m_rDstFile(spDstFile),
-	m_bAllItems(FALSE)
+	m_rDstFile(spDstFile)
 {
 }
 
@@ -45,7 +44,6 @@
 	DDX_Check(pDX, IDC_ALL_ITEMS_CHECK, m_bAllItems);
 }
 
-
 BEGIN_MESSAGE_MAP(CFeedbackReplaceDlg, ictranslate::CLanguageDialog)
 	ON_BN_CLICKED(IDC_REPLACE_BUTTON, &CFeedbackReplaceDlg::OnBnClickedReplaceButton)
 	ON_BN_CLICKED(IDC_COPY_REST_BUTTON, &CFeedbackReplaceDlg::OnBnClickedCopyRestButton)
@@ -121,20 +119,20 @@
 	strTemplate = rManager.LoadString(IDS_INFO_PATH_STRING);
 	ictranslate::CFormat fmt(strTemplate);
 	fmt.SetParam(_T("%pathname"), pathSrc.GetParent().ToString());
-	m_ctlSrcPath.SetWindowText(fmt);
+	m_ctlSrcPath.SetWindowText(fmt.ToString());
 
 	// size
 	strTemplate = rManager.LoadString(IDS_INFO_SIZE_STRING);
 	fmt.SetFormat(strTemplate);
 	fmt.SetParam(_T("%size"), m_rSrcFile.GetLength64());
-	m_ctlSrcSize.SetWindowText(fmt);
+	m_ctlSrcSize.SetWindowText(fmt.ToString());
 
 	// modified date
 	strTemplate = rManager.LoadString(IDS_INFO_MODIFIED_STRING);
 	fmt.SetFormat(strTemplate);
 	COleDateTime dtTemp = m_rSrcFile.GetLastWriteTime().GetAsFiletime();
 	fmt.SetParam(_T("%datemod"), dtTemp.Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
-	m_ctlSrcDate.SetWindowText(fmt);
+	m_ctlSrcDate.SetWindowText(fmt.ToString());
 
 	/////////////////////////////////////////////////////////////
 	// dst file
@@ -147,20 +145,20 @@
 	strTemplate = rManager.LoadString(IDS_INFO_PATH_STRING);
 	fmt.SetFormat(strTemplate);
 	fmt.SetParam(_T("%pathname"), pathDst.GetParent().ToString());
-	m_ctlDstPath.SetWindowText(fmt);
+	m_ctlDstPath.SetWindowText(fmt.ToString());
 
 	// size
 	strTemplate = rManager.LoadString(IDS_INFO_SIZE_STRING);
 	fmt.SetFormat(strTemplate);
 	fmt.SetParam(_T("%size"), m_rDstFile.GetLength64());
-	m_ctlDstSize.SetWindowText(fmt);
+	m_ctlDstSize.SetWindowText(fmt.ToString());
 
 	// modified date
 	strTemplate = rManager.LoadString(IDS_INFO_MODIFIED_STRING);
 	fmt.SetFormat(strTemplate);
 	dtTemp = m_rDstFile.GetLastWriteTime().GetAsFiletime();
 	fmt.SetParam(_T("%datemod"), dtTemp.Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
-	m_ctlDstDate.SetWindowText(fmt);
+	m_ctlDstDate.SetWindowText(fmt.ToString());
 
 	// button captions
 	CWnd* pAppendButton = GetDlgItem(IDC_COPY_REST_BUTTON);
@@ -189,33 +187,39 @@
 void CFeedbackReplaceDlg::OnBnClickedReplaceButton()
 {
 	UpdateData(TRUE);
-	EndDialog(chcore::EFeedbackResult::eResult_Overwrite);
+	EndDialog(chengine::EFeedbackResult::eResult_Overwrite);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedCopyRestButton()
 {
 	UpdateData(TRUE);
-	EndDialog(chcore::EFeedbackResult::eResult_CopyRest);
+	EndDialog(chengine::EFeedbackResult::eResult_CopyRest);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedSkipButton()
 {
 	UpdateData(TRUE);
-	EndDialog(chcore::EFeedbackResult::eResult_Skip);
+	EndDialog(chengine::EFeedbackResult::eResult_Skip);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedPauseButton()
 {
 	UpdateData(TRUE);
-	EndDialog(chcore::EFeedbackResult::eResult_Pause);
+	EndDialog(chengine::EFeedbackResult::eResult_Pause);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedCancelButton()
 {
 	UpdateData(TRUE);
-	EndDialog(chcore::EFeedbackResult::eResult_Cancel);
+	EndDialog(chengine::EFeedbackResult::eResult_Cancel);
 }
 
+void CFeedbackReplaceDlg::OnCancel()
+{
+	UpdateData(TRUE);
+	EndDialog(chengine::EFeedbackResult::eResult_Cancel);
+}
+
 bool CFeedbackReplaceDlg::IsApplyToAllItemsChecked() const
 {
 	return m_bAllItems != FALSE;