all improper calls of OnClose replaced with OnDestroy / OnApply

3 files changed, 4 insertions, 7 deletions

diff --git a/src/mir_app/src/colorchooser.cpp b/src/mir_app/src/colorchooser.cpp
index fd703cb6a1..4787a7a71e 100644
--- a/src/mir_app/src/colorchooser.cpp
+++ b/src/mir_app/src/colorchooser.cpp
@@ -263,10 +263,9 @@ public:
 		return CDlgBase::DlgProc(msg, wParam, lParam);

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		SetFocus(m_hwndTarget);

-		return true;

 	}

 };

 

diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp
index f2702e1928..31d65c2627 100644
--- a/src/mir_app/src/db_ini.cpp
+++ b/src/mir_app/src/db_ini.cpp
@@ -152,11 +152,10 @@ protected:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		m_warnInfo->cancel = !m_bSucceeded;

 		m_warnInfo->warnNoMore = m_noWarn.GetState();

-		return true;

 	}

 

 	void YesNo_OnClick(CCtrlBase*)

diff --git a/src/mir_app/src/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp
index b9fcaa3125..5f0041d502 100644
--- a/src/mir_app/src/skin2opts.cpp
+++ b/src/mir_app/src/skin2opts.cpp
@@ -178,7 +178,7 @@ public:
 	}

 

 	bool OnInitDialog() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 

 	virtual int Resizer(UTILRESIZECONTROL *urc) override

 	{

@@ -834,10 +834,9 @@ bool CIconImportDlg::OnInitDialog()
 	return true;

 }

 

-bool CIconImportDlg::OnClose()

+void CIconImportDlg::OnDestroy()

 {

 	m_pParent->m_btnImport.Enable();

-	return true;

 }

 

 INT_PTR CIconImportDlg::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)