From 911f67b2c232826eb8e80d3c014c18ab568562ed Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 29 Jul 2012 21:52:51 +0200 Subject: [PATCH] Fixed issue #1299: Sync Dialog In Change List grid auto size problem Signed-off-by: Sven Strickroth --- src/TortoiseProc/SyncDlg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index 8a965261d..7ba72b708 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -664,7 +664,7 @@ BOOL CSyncDlg::OnInitDialog() } m_ctrlTabCtrl.InsertTab(&m_InChangeFileList, CString(MAKEINTRESOURCE(IDS_PROC_SYNC_INCHANGELIST)), -1); - m_InChangeFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("OutSyncDlg"), + m_InChangeFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("InSyncDlg"), (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO)| CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2)), false, true, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL); @@ -679,7 +679,7 @@ BOOL CSyncDlg::OnInitDialog() } m_ctrlTabCtrl.InsertTab(&m_ConflictFileList,_T("Conflict"),-1); - m_ConflictFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("OutSyncDlg"), + m_ConflictFileList.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL , _T("ConflictSyncDlg"), (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_COMPARETWO)| CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDGITLC_GNUDIFF2)| GITSLC_POPCONFLICT|GITSLC_POPRESOLVE),false); -- 2.11.4.GIT