all improper calls of OnClose replaced with OnDestroy / OnApply

7 files changed, 19 insertions, 62 deletions

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);