From e5d58fc3bbbce2773b7c6c3f8b7da6faa66b672e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 17 Sep 2016 16:37:24 +0000
Subject: chats: more functions, less structures

git-svn-id: http://svn.miranda-ng.org/main/trunk@17309 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdchat/src/main.cpp     |  2 +-
 src/core/stdchat/src/services.cpp |  4 ++--
 src/core/stdchat/src/window.cpp   | 11 +++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 69b0ba9fc2..d12604f44e 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -124,7 +124,7 @@ static void OnRemoveSession(SESSION_INFO *si)
 {
 	if (!g_Settings.bTabsEnable) {
 		if (si->hWnd)
-			SendMessage(si->hWnd, GC_EVENT_CONTROL + WM_USER + 500, SESSION_TERMINATE, 0);
+			SendMessage(si->hWnd, GC_CONTROL_MSG, SESSION_TERMINATE, 0);
 	}
 	else if (g_TabSession.hWnd)
 		SendMessage(g_TabSession.hWnd, GC_REMOVETAB, 1, (LPARAM)si);
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp
index 91b72f4b3d..f534c4a56c 100644
--- a/src/core/stdchat/src/services.cpp
+++ b/src/core/stdchat/src/services.cpp
@@ -69,7 +69,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground)
 		pci->SetActiveSession(si->ptszID, si->pszModule);
 
 		if (!IsWindowVisible(g_TabSession.hWnd) || wp == WINDOW_HIDDEN)
-			SendMessage(g_TabSession.hWnd, GC_EVENT_CONTROL + WM_USER + 500, wp, 0);
+			SendMessage(g_TabSession.hWnd, GC_CONTROL_MSG, wp, 0);
 		else {
 			if (IsIconic(g_TabSession.hWnd))
 				ShowWindow(g_TabSession.hWnd, SW_NORMAL);
@@ -96,7 +96,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground)
 
 	SetWindowLongPtr(si->hWnd, GWL_EXSTYLE, GetWindowLongPtr(si->hWnd, GWL_EXSTYLE) | WS_EX_APPWINDOW);
 	if (!IsWindowVisible(si->hWnd) || wp == WINDOW_HIDDEN)
-		SendMessage(si->hWnd, GC_EVENT_CONTROL + WM_USER + 500, wp, 0);
+		SendMessage(si->hWnd, GC_CONTROL_MSG, wp, 0);
 	else {
 		if (IsIconic(si->hWnd))
 			ShowWindow(si->hWnd, SW_NORMAL);
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 642dd5b2ea..cd6be436d8 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1459,7 +1459,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			}
 			else Log_StreamInEvent(hwndDlg, si->pLogEnd, si, TRUE, FALSE);
 		}
-		else SendMessage(hwndDlg, GC_EVENT_CONTROL + WM_USER + 500, WINDOW_CLEARLOG, 0);
+		else SendMessage(hwndDlg, GC_CONTROL_MSG, WINDOW_CLEARLOG, 0);
 		break;
 
 	case GC_REDRAWLOG2:
@@ -1478,7 +1478,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		if (si->pLogEnd)
 			Log_StreamInEvent(hwndDlg, si->pLog, si, FALSE, FALSE);
 		else
-			SendMessage(hwndDlg, GC_EVENT_CONTROL + WM_USER + 500, WINDOW_CLEARLOG, 0);
+			SendMessage(hwndDlg, GC_CONTROL_MSG, WINDOW_CLEARLOG, 0);
 		break;
 
 	case GC_SWITCHNEXTTAB:
@@ -1795,11 +1795,6 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		}
 		break;
 
-	case GC_ACKMESSAGE:
-		SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETREADONLY, FALSE, 0);
-		SetDlgItemText(hwndDlg, IDC_MESSAGE, L"");
-		return TRUE;
-
 	case WM_CTLCOLORLISTBOX:
 		SetBkColor((HDC)wParam, g_Settings.crUserListBGColor);
 		return (INT_PTR)pci->hListBkgBrush;
@@ -1886,7 +1881,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 		}
 		break;
 
-	case GC_EVENT_CONTROL + WM_USER + 500:
+	case GC_CONTROL_MSG:
 		switch (wParam) {
 		case SESSION_OFFLINE:
 			SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
-- 
cgit v1.2.3