Fixed issue #933: implement git stash --include-untracked
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.cpp
blob7188480ff2e9df1c1f8d796847c7b7556f4c67e0
1 // DeleteConflictDlg.cpp : implementation file
2 //
4 #include "stdafx.h"
5 #include "resource.h"
6 #include "DeleteConflictDlg.h"
9 // CDeleteConflictDlg dialog
11 IMPLEMENT_DYNAMIC(CDeleteConflictDlg, CResizableStandAloneDialog)
13 CDeleteConflictDlg::CDeleteConflictDlg(CWnd* pParent /*=NULL*/)
14 : CResizableStandAloneDialog(CDeleteConflictDlg::IDD, pParent)
16 , m_LocalStatus(_T(""))
17 , m_RemoteStatus(_T(""))
19 m_bIsDelete =FALSE;
22 CDeleteConflictDlg::~CDeleteConflictDlg()
26 void CDeleteConflictDlg::DoDataExchange(CDataExchange* pDX)
28 CDialog::DoDataExchange(pDX);
30 DDX_Text(pDX, IDC_LOCAL_STATUS, m_LocalStatus);
31 DDX_Text(pDX, IDC_REMOTE_STATUS, m_RemoteStatus);
35 BEGIN_MESSAGE_MAP(CDeleteConflictDlg, CResizableStandAloneDialog)
36 ON_BN_CLICKED(IDC_DELETE, &CDeleteConflictDlg::OnBnClickedDelete)
37 ON_BN_CLICKED(IDC_MODIFY, &CDeleteConflictDlg::OnBnClickedModify)
38 END_MESSAGE_MAP()
41 BOOL CDeleteConflictDlg::OnInitDialog()
43 CResizableStandAloneDialog::OnInitDialog();
44 AddAnchor(IDC_DEL_GROUP, TOP_LEFT, BOTTOM_RIGHT);
45 AddAnchor(IDC_DELETE, BOTTOM_RIGHT);
46 AddAnchor(IDC_MODIFY, BOTTOM_RIGHT);
47 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
49 if(this->m_bShowModifiedButton )
50 this->GetDlgItem(IDC_MODIFY)->SetWindowText(_T("Modified"));
51 else
52 this->GetDlgItem(IDC_MODIFY)->SetWindowText(_T("Created"));
54 CString title;
55 this->GetWindowText(title);
56 title +=_T(" - ") +this->m_File;
57 this->SetWindowText(title);
58 return TRUE;
60 // CDeleteConflictDlg message handlers
62 void CDeleteConflictDlg::OnBnClickedDelete()
64 m_bIsDelete = TRUE;
65 OnOK();
68 void CDeleteConflictDlg::OnBnClickedModify()
70 m_bIsDelete = FALSE;
71 OnOK();