From 562eb63f1a9056b8e68ec8bf864e03130d62318e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 5 Jan 2014 12:51:00 +0100 Subject: [PATCH] Disable close button by default Signed-off-by: Sven Strickroth --- src/Resources/TortoiseProcENG.rc | 2 +- src/TortoiseProc/ProgressDlg.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 0b542db46..04b76c4ec 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1064,7 +1064,7 @@ EXSTYLE WS_EX_WINDOWEDGE | WS_EX_APPWINDOW CAPTION "Git Command Progress" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "&Close",IDOK,200,168,50,14 + DEFPUSHBUTTON "&Close",IDOK,200,168,50,14,WS_DISABLED PUSHBUTTON "Abort",IDCANCEL,266,168,50,14 CONTROL "",IDC_TITLE_ANIMATE,"SysAnimate32",ACS_TRANSPARENT | ACS_AUTOPLAY | WS_TABSTOP,6,7,318,38,WS_EX_TRANSPARENT CONTROL "",IDC_RUN_PROGRESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,6,63,318,14 diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp index 6d20f50c0..d1a1ba915 100644 --- a/src/TortoiseProc/ProgressDlg.cpp +++ b/src/TortoiseProc/ProgressDlg.cpp @@ -329,7 +329,6 @@ LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam) { m_BufStart = 0 ; m_Animate.Play(0, INT_MAX, INT_MAX); - this->DialogEnableWindow(IDOK,FALSE); if (m_pTaskbarList) { m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL); -- 2.11.4.GIT