OSDN Git Service

Add support i18n.logOutputEncoding at log list
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / DeleteConflictDlg.h
1 #pragma once\r
2 \r
3 #include "StandAloneDlg.h"\r
4 // CDeleteConflictDlg dialog\r
5 \r
6 class CDeleteConflictDlg : public CResizableStandAloneDialog\r
7 {\r
8         DECLARE_DYNAMIC(CDeleteConflictDlg)\r
9 \r
10 public:\r
11         CDeleteConflictDlg(CWnd* pParent = NULL);   // standard constructor\r
12         virtual ~CDeleteConflictDlg();\r
13 \r
14 // Dialog Data\r
15         enum { IDD = IDD_RESOLVE_CONFLICT };\r
16 \r
17 protected:\r
18         virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
19         BOOL OnInitDialog();\r
20         DECLARE_MESSAGE_MAP()\r
21 \r
22 public:\r
23         CString m_LocalStatus;\r
24 public:\r
25         CString m_RemoteStatus;\r
26         BOOL    m_bShowModifiedButton;\r
27         CString m_File;\r
28         BOOL    m_bIsDelete;\r
29 public:\r
30         afx_msg void OnBnClickedDelete();\r
31 public:\r
32         afx_msg void OnBnClickedModify();\r
33 };\r