-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathDiffAndMerge.h
More file actions
32 lines (26 loc) · 817 Bytes
/
DiffAndMerge.h
File metadata and controls
32 lines (26 loc) · 817 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
#pragma once
// CDiffAndMerge dialog
class CDiffAndMerge : public CDialogEx
{
DECLARE_DYNAMIC(CDiffAndMerge)
public:
CDiffAndMerge(CWnd* pParent = NULL); // standard constructor
virtual ~CDiffAndMerge();
// Dialog Data
enum { IDD = IDD_DIA_COMPNMERGE };
CString m_strPathName[5]; // 0-2: File A, B, Base; 3-Diff; 4-Merged
BOOL m_bDoMerge, m_bDo1L;
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
DECLARE_MESSAGE_MAP()
public:
afx_msg void OnBnClickedButtonA();
afx_msg void OnBnClickedButtonB();
afx_msg void OnBnClickedButtonDiffFile();
virtual void OnOK();
virtual BOOL OnInitDialog();
afx_msg void OnBnClickedButtonBase();
afx_msg void OnBnClickedMerge();
afx_msg void OnBnClickedCompare();
afx_msg void OnBnClickedButtonmerge();
};