all improper calls of OnClose replaced with OnDestroy / OnApply

22 files changed, 49 insertions, 117 deletions

diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp
index 7018e90521..9dd4dc0cd5 100644
--- a/plugins/CrashDumper/src/ui.cpp
+++ b/plugins/CrashDumper/src/ui.cpp
@@ -65,7 +65,7 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		Window_FreeIcon_IcoLib(m_hwnd);

 		Utils_SaveWindowPosition(m_hwnd, NULL, MODULENAME, "ViewInfo_");

@@ -73,7 +73,6 @@ public:
 			pViewDialog = nullptr;

 		if (g_plugin.bServiceMode)

 			PostQuitMessage(0);

-		return true;

 	}

 

 	int Resizer(UTILRESIZECONTROL *urc) override

diff --git a/plugins/Db3x_mmap/src/ui.h b/plugins/Db3x_mmap/src/ui.h
index 83d7d3dbb4..c52a479bc6 100644
--- a/plugins/Db3x_mmap/src/ui.h
+++ b/plugins/Db3x_mmap/src/ui.h
@@ -7,6 +7,7 @@ class CSelectCryptoDialog : public CDlgBase
 	CRYPTO_PROVIDER **m_provs;

 	size_t m_provscount;

 	CRYPTO_PROVIDER *m_selected;

+

 public:

 	CSelectCryptoDialog(CRYPTO_PROVIDER **provs, size_t count) : 

 		CDlgBase(g_plugin, IDD_SELECT_CRYPTOPROVIDER), 

@@ -31,7 +32,7 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	bool OnApply() override

 	{

 		m_selected = m_provs[ m_combo.GetItemData(m_combo.GetCurSel()) ];

 		return true;

diff --git a/plugins/Dbx_mdbx/src/dbcrypt.cpp b/plugins/Dbx_mdbx/src/dbcrypt.cpp
index 117c5e0af6..8c47a1a4d3 100644
--- a/plugins/Dbx_mdbx/src/dbcrypt.cpp
+++ b/plugins/Dbx_mdbx/src/dbcrypt.cpp
@@ -44,7 +44,7 @@ class CSelectCryptoDialog : public CDlgBase
 		return true;

 	}

 

-	bool OnClose() override

+	bool OnApply() override

 	{

 		m_selected = m_provs[m_combo.GetItemData(m_combo.GetCurSel())];

 		m_bTotalEncryption = m_chkTotalCrypt.GetState() != 0;

diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index d29e02aaaa..7e45a57575 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -52,11 +52,10 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		if (pHelpDialog == this)

 			pHelpDialog = nullptr;

-		return true;

 	}

 

 	void OnCloseClick(CCtrlBase*)

diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp
index 4cb84ce5bc..fcc3bbd8d4 100644
--- a/plugins/Import/src/wizard.cpp
+++ b/plugins/Import/src/wizard.cpp
@@ -147,16 +147,12 @@ public:
 		return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		Utils_SaveWindowPosition(m_hwnd, 0, IMPORT_MODULE, "wiz");

 		if (hwndPage)

 			DestroyWindow(hwndPage);

-		return true;

-	}

 

-	void OnDestroy() override

-	{

 		g_hwndWizard = nullptr;

 		delete g_pBatch; g_pBatch = nullptr;

 

diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp
index 1043d70898..b5089e9a42 100644
--- a/plugins/MyDetails/src/services.cpp
+++ b/plugins/MyDetails/src/services.cpp
@@ -96,11 +96,10 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		if (pSetNickDialog == this)

 			pSetNickDialog = nullptr;

-		return true;

 	}

 };

 

diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index faead58d54..52d0293005 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -1114,12 +1114,11 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	bool OnApply() override

 	{

 		if (m_pReminder)

 			DeleteReminder(m_pReminder);

 		JustSaveReminders();

-		NotifyList();

 		return true;

 	}

 

@@ -1419,12 +1418,11 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		bNewReminderVisible = false;

 		if (m_pReminder)

 			m_pReminder->bVisible = false;

-		return true;

 	}

 

 	void onClick_Add(CCtrlButton*)

diff --git a/protocols/IRCG/src/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h
index 6da582a634..b070217fd7 100644
--- a/protocols/IRCG/src/irc_dlg.h
+++ b/protocols/IRCG/src/irc_dlg.h
@@ -65,7 +65,6 @@ struct CWhoisDlg : public CCoolIrcDlg
 	void OnVersion(CCtrlButton*);

 

 	bool OnInitDialog() override;

-	bool OnClose() override;

 	void OnDestroy() override;

 };

 

@@ -170,7 +169,7 @@ struct CQuestionDlg : public CCoolIrcDlg
 

 	bool OnInitDialog() override;

 	bool OnApply() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 

 	void Activate();

 

@@ -300,5 +299,5 @@ struct CAddIgnoreDlg : public CProtoDlgBase < CIrcProto >
 

 	bool OnInitDialog() override;

 	bool OnApply() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 };

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 22bbde0610..853cbd8048 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -365,13 +365,12 @@ struct CServerDlg : public CProtoDlgBase<CIrcProto>
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		m_owner->m_serverCombo.Enable();

 		m_owner->m_add.Enable();

 		m_owner->m_edit.Enable();

 		m_owner->m_del.Enable();

-		return true;

 	}

 };

 

@@ -1220,10 +1219,9 @@ bool CAddIgnoreDlg::OnApply()
 	return true;

 }

 

-bool CAddIgnoreDlg::OnClose()

+void CAddIgnoreDlg::OnDestroy()

 {

 	m_owner->FixButtons();

-	return true;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index b952e936f3..44a5d90d79 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -90,13 +90,6 @@ bool CWhoisDlg::OnInitDialog()
 	return true;

 }

 

-bool CWhoisDlg::OnClose()

-{

-	ShowWindow(m_hwnd, SW_HIDE);

-	SendMessage(m_hwnd, WM_SETREDRAW, FALSE, 0);

-	return true;

-}

-

 void CWhoisDlg::OnDestroy()

 {

 	CCoolIrcDlg::OnDestroy();

@@ -722,13 +715,6 @@ bool CQuestionDlg::OnInitDialog()
 	return true;

 }

 

-bool CQuestionDlg::OnClose()

-{

-	if (m_owner)

-		m_owner->CloseQuestion();

-	return true;

-}

-

 bool CQuestionDlg::OnApply()

 {

 	int i = GetWindowTextLength(GetDlgItem(m_hwnd, IDC_EDIT));

@@ -776,6 +762,12 @@ bool CQuestionDlg::OnApply()
 	return true;

 }

 

+void CQuestionDlg::OnDestroy()

+{

+	if (m_owner)

+		m_owner->CloseQuestion();

+}

+

 void CQuestionDlg::Activate()

 {

 	ShowWindow(m_hwnd, SW_SHOW);

@@ -934,7 +926,7 @@ bool CManagerDlg::OnClose()
 		m_proto->setWString(p, S.c_str());

 		mir_free(p);

 	}

-	DestroyWindow(m_hwnd);

+

 	return true;

 }

 

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 92f4d11467..527c149497 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -214,7 +214,7 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		LVCOLUMN lvc = { 0 };

 		lvc.mask = LVCF_WIDTH;

@@ -227,28 +227,7 @@ public:
 

 		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "bookmarksWnd_");

 

-		return CSuper::OnClose();

-	}

-

-	void OnDestroy() override

-	{

 		m_proto->m_pDlgBookmarks = nullptr;

-		CSuper::OnDestroy();

-	}

-

-	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override

-	{

-		switch (msg) {

-		case WM_COMMAND:

-			switch (LOWORD(wParam)) {

-			case IDOK:

-				OpenBookmark();

-				return TRUE;

-			}

-			break;

-		}

-

-		return CSuper::DlgProc(msg, wParam, lParam);

 	}

 

 	int Resizer(UTILRESIZECONTROL *urc) override

diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index e44fce1c29..8d14701bf4 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -377,21 +377,20 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	bool OnApply() override

 	{

 		m_proto->setByte("consoleWnd_msg", m_proto->m_filterInfo.msg);

 		m_proto->setByte("consoleWnd_presence", m_proto->m_filterInfo.presence);

 		m_proto->setByte("consoleWnd_iq", m_proto->m_filterInfo.iq);

 		m_proto->setByte("consoleWnd_ftype", m_proto->m_filterInfo.type);

 		m_proto->setWString("consoleWnd_fpattern", m_proto->m_filterInfo.pattern);

-

-		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "consoleWnd_");

-		DestroyWindow(m_hwnd);

-		return CSuper::OnClose();

+		return true;

 	}

 

 	void OnDestroy() override

 	{

+		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "consoleWnd_");

+

 		IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_MSG, BM_SETIMAGE, IMAGE_ICON, 0));

 		IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_PRESENCE, BM_SETIMAGE, IMAGE_ICON, 0));

 		IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(m_hwnd, IDC_BTN_IQ, BM_SETIMAGE, IMAGE_ICON, 0));

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index 5986f09eb0..99489348bd 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -667,13 +667,12 @@ public:
 		if ((GetWindowLongPtr(hwndFocus, GWL_ID) == IDC_COMBO_NODE) || (GetWindowLongPtr(hwndFocus, GWL_ID) == IDC_COMBO_JID))

 			PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0);

 

+		m_proto->setByte("discoWnd_useTree", IsDlgButtonChecked(m_hwnd, IDC_BTN_VIEWTREE));

 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

-		m_proto->setByte("discoWnd_useTree", IsDlgButtonChecked(m_hwnd, IDC_BTN_VIEWTREE));

-

 		LVCOLUMN lvc = { 0 };

 		lvc.mask = LVCF_WIDTH;

 		m_lstDiscoTree.GetColumn(0, &lvc);

@@ -684,13 +683,7 @@ public:
 		m_proto->setWord("discoWnd_cx2", lvc.cx);

 

 		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "discoWnd_");

-		DestroyWindow(m_hwnd);

 

-		return CSuper::OnClose();

-	}

-

-	void OnDestroy() override

-	{

 		m_proto->m_pDlgServiceDiscovery = nullptr;

 		{

 			mir_cslock lck(m_proto->m_SDManager.cs());

diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index 458b89473e..0a504a99ea 100644
--- a/protocols/JabberG/src/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
@@ -210,16 +210,12 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

-	{

-		FreeList();

-		m_proto->GetMucDlg(m_info->type) = nullptr;

-		return true;

-	}

-

 	void OnDestroy() override

 	{

 		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "jidListWnd_");

+

+		FreeList();

+		m_proto->GetMucDlg(m_info->type) = nullptr;

 	}

 

 	INT_PTR DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) override

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index c7065598cb..eacdc679aa 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -222,11 +222,10 @@ public:
 		return CSuper::Resizer(urc);

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		if (m_fnProcess)

 			(m_proto->*m_fnProcess)(m_pNote, false);

-		return CSuper::OnClose();

 	}

 };

 

@@ -524,14 +523,16 @@ public:
 			if (IDYES != MessageBox(m_hwnd, TranslateT("Notes are not saved, close this window without uploading data to server?"), TranslateT("Are you sure?"), MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2))

 				return false;

 

-		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "notesWnd_");

-		DeleteObject(m_hfntSmall);

-		DeleteObject(m_hfntBold);

-		return CSuper::OnClose();

+		return true;

 	}

 

 	void OnDestroy() override

 	{

+		Utils_SaveWindowPosition(m_hwnd, 0, m_proto->m_szModuleName, "notesWnd_");

+

+		DeleteObject(m_hfntSmall);

+		DeleteObject(m_hfntBold);

+

 		m_tvFilter.DeleteAllItems();

 		m_proto->m_pDlgNotes = nullptr;

 		CSuper::OnDestroy();

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index ce16d1ae0c..5c9cfb9eff 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -307,12 +307,6 @@ public:
 		m_txtName.GetTextU(szLine, _countof(szLine));

 		return true;

 	}

-	

-	bool OnClose() override

-	{

-		EndModal(m_bSucceeded);

-		return true;

-	}

 };

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -1369,11 +1363,7 @@ public:
 

 	bool OnClose() override

 	{

-		if (!CanExit())

-			return false;

-

-		DestroyWindow(m_hwnd);

-		return CSuper::OnClose();

+		return CanExit();

 	}

 

 	void OnDestroy() override

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index fd41daf761..12c582a3f5 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -579,12 +579,11 @@ public:
 		return true;

 	}

 

-	bool OnClose() override

+	void OnDestroy() override

 	{

 		m_proto->SendHttpAuthReply(m_pParams, m_bSucceeded);

 		m_pParams->Free();

 		mir_free(m_pParams);

-		return true;

 	}

 

 	UI_MESSAGE_MAP(CJabberDlgHttpAuth, CSuper);

diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp
index 690e04d1e6..1a8fcf474b 100644
--- a/protocols/Steam/src/steam_dialogs.cpp
+++ b/protocols/Steam/src/steam_dialogs.cpp
@@ -29,10 +29,9 @@ bool CSteamPasswordEditor::OnApply()
 	return true;

 }

 

-bool CSteamPasswordEditor::OnClose()

+void CSteamPasswordEditor::OnDestroy()

 {

 	Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "PasswordWindow");

-	return true;

 }

 

 /////////////////////////////////////////////////////////////////////////////////

@@ -67,11 +66,10 @@ bool CSteamGuardDialog::OnApply()
 	return true;

 }

 

-bool CSteamGuardDialog::OnClose()

+void CSteamGuardDialog::OnDestroy()

 {

 	m_proto->m_hwndGuard = nullptr;

 	Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "GuardWindow");

-	return true;

 }

 

 /////////////////////////////////////////////////////////////////////////////////

@@ -102,10 +100,9 @@ bool CSteamTwoFactorDialog::OnApply()
 	return true;

 }

 

-bool CSteamTwoFactorDialog::OnClose()

+void CSteamTwoFactorDialog::OnDestroy()

 {

 	Utils_SaveWindowPosition(m_hwnd, NULL, m_proto->m_szModuleName, "TwoFactorWindow");

-	return true;

 }

 

 /////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/Steam/src/steam_dialogs.h b/protocols/Steam/src/steam_dialogs.h
index 8389e0bfd3..0322056230 100644
--- a/protocols/Steam/src/steam_dialogs.h
+++ b/protocols/Steam/src/steam_dialogs.h
@@ -15,7 +15,7 @@ class CSteamPasswordEditor : public CSteamDlgBase
 protected:

 	bool OnInitDialog() override;

 	bool OnApply() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 

 public:

 	CSteamPasswordEditor(CSteamProto *proto);

@@ -34,7 +34,7 @@ class CSteamGuardDialog : public CSteamDlgBase
 protected:

 	bool OnInitDialog() override;

 	bool OnApply() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 

 public:

 	CSteamGuardDialog(CSteamProto *proto, const char *domain);

@@ -55,7 +55,7 @@ class CSteamTwoFactorDialog : public CSteamDlgBase
 protected:

 	bool OnInitDialog() override;

 	bool OnApply() override;

-	bool OnClose() override;

+	void OnDestroy() override;

 

 public:

 	CSteamTwoFactorDialog(CSteamProto *proto);

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)