Index: src/ch/FeedbackReplaceDlg.cpp =================================================================== diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -rd9527df01ee91b35d9a5fdccb80ded25a9c8265f --- src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision 8068e0c351055554340ac9755d1bc846893bf2b8) +++ src/ch/FeedbackReplaceDlg.cpp (.../FeedbackReplaceDlg.cpp) (revision d9527df01ee91b35d9a5fdccb80ded25a9c8265f) @@ -6,7 +6,6 @@ #include "../libchcore/TFileInfo.h" #include "FeedbackReplaceDlg.h" #include "../libictranslate/ResourceManager.h" -#include "../libchcore/TFileInfo.h" #include "FeedbackHandler.h" #include "resource.h" @@ -16,9 +15,9 @@ CFeedbackReplaceDlg::CFeedbackReplaceDlg(const chcore::TFileInfo& spSrcFile, const chcore::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) @@ -61,6 +59,10 @@ { CLanguageDialog::OnInitDialog(); + // set dialog icon + HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); + SetIcon(hIcon, FALSE); + AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 0.0); AddResizableControl(IDC_00_STATIC, 0.0, 0.0, 1.0, 0.0); @@ -212,6 +214,12 @@ EndDialog(chcore::EFeedbackResult::eResult_Cancel); } +void CFeedbackReplaceDlg::OnCancel() +{ + UpdateData(TRUE); + EndDialog(chcore::EFeedbackResult::eResult_Cancel); +} + bool CFeedbackReplaceDlg::IsApplyToAllItemsChecked() const { return m_bAllItems != FALSE;