BrowseRefs: Context menu enhancements
[TortoiseGit.git] / src / TortoiseProc / MergeDlg.cpp
blob179bb25be5e560e184536da237c78c00ed5ea5ac
1 // MergeDlg.cpp : implementation file
2 //
4 #include "stdafx.h"
6 #include "Git.h"
7 #include "TortoiseProc.h"
8 #include "MergeDlg.h"
11 #include "Messagebox.h"
12 // CMergeDlg dialog
14 IMPLEMENT_DYNAMIC(CMergeDlg, CResizableStandAloneDialog)
16 CMergeDlg::CMergeDlg(CWnd* pParent /*=NULL*/)
17 : CResizableStandAloneDialog(CMergeDlg::IDD, pParent),
18 CChooseVersion(this)
23 CMergeDlg::~CMergeDlg()
27 void CMergeDlg::DoDataExchange(CDataExchange* pDX)
29 CDialog::DoDataExchange(pDX);
31 CHOOSE_VERSION_DDX;
33 DDX_Check(pDX,IDC_CHECK_NOFF,this->m_bNoFF);
34 DDX_Check(pDX,IDC_CHECK_SQUASH,this->m_bSquash);
38 BEGIN_MESSAGE_MAP(CMergeDlg, CResizableStandAloneDialog)
39 CHOOSE_VERSION_EVENT
40 ON_BN_CLICKED(IDOK, &CMergeDlg::OnBnClickedOk)
41 END_MESSAGE_MAP()
44 BOOL CMergeDlg::OnInitDialog()
46 CResizableStandAloneDialog::OnInitDialog();
49 CHOOSE_VERSION_ADDANCHOR;
51 AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);
54 AddAnchor(IDOK,BOTTOM_RIGHT);
55 AddAnchor(IDCANCEL,BOTTOM_RIGHT);
57 this->AddOthersToAnchor();
59 CheckRadioButton(IDC_RADIO_BRANCH,IDC_RADIO_VERSION,IDC_RADIO_BRANCH);
61 Init();
63 this->SetDefaultChoose(IDC_RADIO_BRANCH);
65 EnableSaveRestore(_T("MergeDlg"));
67 return TRUE;
70 // CMergeDlg message handlers
73 void CMergeDlg::OnBnClickedOk()
75 // TODO: Add your control notification handler code here
76 this->UpdateData(TRUE);
78 this->UpdateRevsionName();
80 OnOK();