Index: src/ch/FeedbackReplaceDlg.h =================================================================== diff -u -r22bbc4a87fa0b249e1e02ba385f28da9d77a4aa1 -r8068e0c351055554340ac9755d1bc846893bf2b8 --- src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 22bbc4a87fa0b249e1e02ba385f28da9d77a4aa1) +++ src/ch/FeedbackReplaceDlg.h (.../FeedbackReplaceDlg.h) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) @@ -24,11 +24,13 @@ DECLARE_DYNAMIC(CFeedbackReplaceDlg) public: - CFeedbackReplaceDlg(const CFileInfoPtr& spSrcFile, const CFileInfoPtr& spDstFile, CWnd* pParent = NULL); // standard constructor + CFeedbackReplaceDlg(const chcore::TFileInfo& spSrcFile, const chcore::TFileInfo& spDstFile, CWnd* pParent = nullptr); // standard constructor virtual ~CFeedbackReplaceDlg(); virtual BOOL OnInitDialog(); + bool IsApplyToAllItemsChecked() const; + protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support @@ -37,16 +39,25 @@ 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 CFileInfoPtr m_spSrcFile; - const CFileInfoPtr m_spDstFile; + const chcore::TFileInfo& m_rSrcFile; + const chcore::TFileInfo& m_rDstFile; public: afx_msg void OnBnClickedReplaceButton();