Index: src/ch/FeedbackReplaceDlg.h
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r0d5b67ee96b435d63f7bf075dc8e28603793b187
--- src/ch/FeedbackReplaceDlg.h	(.../FeedbackReplaceDlg.h)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/FeedbackReplaceDlg.h	(.../FeedbackReplaceDlg.h)	(revision 0d5b67ee96b435d63f7bf075dc8e28603793b187)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+ *   Copyright (C) 2001-2008 by Jozef Starosczyk                           *
  *   ixen@copyhandler.com                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,40 +19,52 @@
 #ifndef __FEEDBACKREPLACEDLG_H__
 #define __FEEDBACKREPLACEDLG_H__
 
-#include "afxwin.h"
-#include "resource.h"
-class CFileInfo;
+namespace chengine
+{
+	class TFileInfo;
+}
 
 class CFeedbackReplaceDlg : public ictranslate::CLanguageDialog
 {
 	DECLARE_DYNAMIC(CFeedbackReplaceDlg)
-public:
-	// Dialog Data
-	enum { IDD = IDD_FEEDBACK_REPLACE_DIALOG };
 
 public:
-	CFeedbackReplaceDlg(const CFileInfo* pfiSrcFile, const CFileInfo* pfiDstFile, CWnd* pParent = NULL);   // standard constructor
+	CFeedbackReplaceDlg(const chengine::TFileInfo& spSrcFile, const chengine::TFileInfo& spDstFile, CWnd* pParent = nullptr);   // standard constructor
 	virtual ~CFeedbackReplaceDlg();
 
-	virtual BOOL OnInitDialog();
+	BOOL OnInitDialog() override;
 
+	bool IsApplyToAllItemsChecked() const;
+
 protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
+	void OnCancel() override;
 
 	void RefreshFilesInfo();
 	void RefreshImages();
 
 	DECLARE_MESSAGE_MAP()
-public:
+
+private:
 	CStatic m_ctlSrcIcon;
 	CStatic m_ctlDstIcon;
-	CStatic m_ctlSrcInfo;
-	CStatic m_ctlDstInfo;
+
+	CEdit m_ctlSrcName;
+	CEdit m_ctlSrcPath;
+	CEdit m_ctlSrcSize;
+	CEdit m_ctlSrcDate;
+
+	CEdit m_ctlDstName;
+	CEdit m_ctlDstPath;
+	CEdit m_ctlDstSize;
+	CEdit m_ctlDstDate;
+
 	BOOL m_bAllItems;
 
 protected:
-	const CFileInfo* m_pfiSrcFile;
-	const CFileInfo* m_pfiDstFile;
+	const chengine::TFileInfo& m_rSrcFile;
+	const chengine::TFileInfo& m_rDstFile;
+
 public:
 	afx_msg void OnBnClickedReplaceButton();
 	afx_msg void OnBnClickedCopyRestButton();