From c9b740a178828eae5cc4be7ab054e5f26d3a27e7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 21 Sep 2023 14:34:07 +0300
Subject: MessageWindowEventData: useless structure removed

---
 plugins/SmileyAdd/src/dlgboxsubclass.cpp | 46 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'plugins/SmileyAdd/src')

diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
index 6d37f6e936..b8e7440350 100644
--- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
@@ -150,17 +150,19 @@ int SmileyButtonPressed(WPARAM, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////
 // window hook
 
-static int MsgDlgHook(WPARAM, LPARAM lParam)
+static int MsgDlgHook(WPARAM uType, LPARAM lParam)
 {
-	const MessageWindowEventData *wndEvtData = (MessageWindowEventData*)lParam;
-	switch (wndEvtData->uType) {
+	auto *pDlg = (CSrmmBaseDialog *)lParam;
+	auto hwndLog = pDlg->log()->GetHwnd();
+
+	switch (uType) {
 	case MSG_WINDOW_EVT_OPENING:
 		{
 			MsgWndData *msgwnd = new MsgWndData();
-			msgwnd->hwnd = wndEvtData->hwndWindow;
-			msgwnd->hContact = wndEvtData->hContact;
-			msgwnd->hwndLog = wndEvtData->hwndLog;
-			msgwnd->hwndInput = wndEvtData->hwndInput;
+			msgwnd->hwnd = pDlg->GetHwnd();
+			msgwnd->hContact = pDlg->m_hContact;
+			msgwnd->hwndLog = hwndLog;
+			msgwnd->hwndInput = pDlg->GetInput();
 
 			// Get the protocol for this contact to display correct smileys.
 			char *protonam = Proto_GetBaseAccountName(DecodeMetaContact(msgwnd->hContact));
@@ -174,30 +176,30 @@ static int MsgDlgHook(WPARAM, LPARAM lParam)
 			g_MsgWndList.insert(msgwnd);
 		}
 
-		SetRichOwnerCallback(wndEvtData->hwndWindow, wndEvtData->hwndInput, wndEvtData->hwndLog);
+		SetRichOwnerCallback(pDlg->GetHwnd(), pDlg->GetInput(), hwndLog);
 
-		if (wndEvtData->hwndLog)
-			SetRichCallback(wndEvtData->hwndLog, wndEvtData->hContact, false, false);
-		if (wndEvtData->hwndInput)
-			SetRichCallback(wndEvtData->hwndInput, wndEvtData->hContact, false, false);
+		if (hwndLog)
+			SetRichCallback(hwndLog, pDlg->m_hContact, false, false);
+		if (pDlg->GetInput())
+			SetRichCallback(pDlg->GetInput(), pDlg->m_hContact, false, false);
 		break;
 
 	case MSG_WINDOW_EVT_OPEN:
-		SetRichOwnerCallback(wndEvtData->hwndWindow, wndEvtData->hwndInput, wndEvtData->hwndLog);
-		if (wndEvtData->hwndLog)
-			SetRichCallback(wndEvtData->hwndLog, wndEvtData->hContact, true, true);
-		if (wndEvtData->hwndInput) {
-			SetRichCallback(wndEvtData->hwndInput, wndEvtData->hContact, true, true);
-			SendMessage(wndEvtData->hwndInput, WM_REMAKERICH, 0, 0);
+		SetRichOwnerCallback(pDlg->GetHwnd(), pDlg->GetInput(), hwndLog);
+		if (hwndLog)
+			SetRichCallback(hwndLog, pDlg->m_hContact, true, true);
+		if (pDlg->GetInput()) {
+			SetRichCallback(pDlg->GetInput(), pDlg->m_hContact, true, true);
+			SendMessage(pDlg->GetInput(), WM_REMAKERICH, 0, 0);
 		}
 		break;
 
 	case MSG_WINDOW_EVT_CLOSE:
-		if (wndEvtData->hwndLog) {
-			CloseRichCallback(wndEvtData->hwndLog);
-			CloseRichOwnerCallback(wndEvtData->hwndWindow);
+		if (hwndLog) {
+			CloseRichCallback(hwndLog);
+			CloseRichOwnerCallback(pDlg->GetHwnd());
 		}
-		mir_unsubclassWindow(wndEvtData->hwndWindow, MessageDlgSubclass);
+		mir_unsubclassWindow(pDlg->GetHwnd(), MessageDlgSubclass);
 		break;
 	}
 	return 0;
-- 
cgit v1.2.3