From f531ff887729783a7fe7a3e12ad12f658eefc7b0 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 4 Jun 2020 17:03:28 +0300
Subject: UI classes:

- CDlgBase::m_bSucceeded variable introduced to check whether IDOK was pressed or not;
- unused/useless buttons with id=IDOK or IDCANCEL removed;
- brnOk.OnClick replaced with OnApply calls;
- unused/useless calls of EndDialog/EndModal removed;
- minor code cleaning
---
 plugins/PluginUpdater/src/DlgListNew.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'plugins/PluginUpdater/src')

diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp
index b264635d05..53cf844391 100644
--- a/plugins/PluginUpdater/src/DlgListNew.cpp
+++ b/plugins/PluginUpdater/src/DlgListNew.cpp
@@ -128,11 +128,9 @@ public:
 		m_list(this, IDC_LIST_UPDATES),
 		m_filter(this, IDC_SEARCH)
 	{
-		m_autoClose = CLOSE_ON_CANCEL;
 		SetParent(GetDesktopWindow());
 		SetMinSize(370, 300);
 
-		btnOk.OnClick = Callback(this, &CMissingPLuginsDlg::onClick_Ok);
 		btnNone.OnClick = Callback(this, &CMissingPLuginsDlg::onClick_None);
 
 		m_filter.OnChange = Callback(this, &CMissingPLuginsDlg::onChange_Filter);
@@ -211,6 +209,14 @@ public:
 		return true;
 	}
 
+	bool OnApply() override
+	{
+		btnOk.Disable();
+		btnNone.Disable();
+		mir_forkthread(ApplyDownloads, this);
+		return false; // do not allow a dialog to close
+	}
+
 	void OnDestroy() override
 	{
 		Utils_SaveWindowPosition(m_hwnd, NULL, MODULENAME, "ListWindow");
@@ -260,13 +266,6 @@ public:
 		}
 	}
 
-	void onClick_Ok(CCtrlButton *)
-	{
-		btnOk.Disable();
-		btnNone.Disable();
-		mir_forkthread(ApplyDownloads, this);
-	}
-
 	void onClick_None(CCtrlButton *)
 	{
 		SelectAll(false);
-- 
cgit v1.2.3