3 #include "StandAloneDlg.h"
4 // CDeleteConflictDlg dialog
6 class CDeleteConflictDlg
: public CResizableStandAloneDialog
8 DECLARE_DYNAMIC(CDeleteConflictDlg
)
11 CDeleteConflictDlg(CWnd
* pParent
= NULL
); // standard constructor
12 virtual ~CDeleteConflictDlg();
15 enum { IDD
= IDD_RESOLVE_CONFLICT
};
18 virtual void DoDataExchange(CDataExchange
* pDX
); // DDX/DDV support
23 CString m_LocalStatus
;
25 CString m_RemoteStatus
;
26 BOOL m_bShowModifiedButton
;
30 afx_msg
void OnBnClickedDelete();
32 afx_msg
void OnBnClickedModify();