unused constants removed from m_chat_int.h

5 files changed, 11 insertions, 32 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 1c31707f66..5dd5596c13 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -39,25 +39,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define GC_FAKE_EVENT MEVENT(0xBABABEDA)

 

-#define GC_GETITEMDATA         (WM_USER+104)

-#define GC_SETITEMDATA         (WM_USER+105)

 #define GC_UPDATESTATUSBAR     (WM_USER+106)

-#define GC_SETVISIBILITY       (WM_USER+107)

 #define GC_SETWNDPROPS         (WM_USER+108)

 #define GC_REDRAWLOG           (WM_USER+109)

-#define GC_FILTERFIX           (WM_USER+111)

-#define GC_CHANGEFILTERFLAG    (WM_USER+112)

 #define GC_SHOWFILTERMENU      (WM_USER+113)

 #define GC_REDRAWWINDOW        (WM_USER+118)

 #define GC_SHOWCOLORCHOOSER    (WM_USER+119)

 #define GC_ADDLOG              (WM_USER+120)

 #define GC_UPDATENICKLIST      (WM_USER+125)

-#define GC_TABCHANGE           (WM_USER+127)

 #define GC_SCROLLTOBOTTOM      (WM_USER+129)

 #define GC_FIXTABICONS         (WM_USER+132)

-#define GC_SWITCHNEXTTAB       (WM_USER+135)

-#define GC_SWITCHPREVTAB       (WM_USER+136)

-#define GC_SWITCHTAB           (WM_USER+137)

 #define GC_SETTABHIGHLIGHT     (WM_USER+138)

 #define GC_SETMESSAGEHIGHLIGHT (WM_USER+139)

 #define GC_REDRAWLOG2          (WM_USER+140)

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 740b4ff579..97054b8993 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -426,7 +426,7 @@ INT_PTR CALLBACK CChatRoomDlg::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 			if (iFlags & GC_EVENT_ADDSTATUS)

 				iFlags |= GC_EVENT_REMOVESTATUS;

 

-			SendMessage(pDlg->GetHwnd(), GC_CHANGEFILTERFLAG, 0, iFlags);

+			pDlg->m_iLogFilterFlags = iFlags;

 			if (pDlg->m_bFilterEnabled)

 				SendMessage(pDlg->GetHwnd(), GC_REDRAWLOG, 0, 0);

 			PostMessage(hwndDlg, WM_CLOSE, 0, 0);

@@ -1545,10 +1545,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		UpdateTitle();

 		break;

 

-	case GC_CHANGEFILTERFLAG:

-		m_iLogFilterFlags = lParam;

-		break;

-

 	case GC_SHOWFILTERMENU:

 		{

 			HWND hwnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index d688d2ca85..02f2ad473f 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -1064,7 +1064,7 @@ INT_PTR CALLBACK CChatRoomDlg::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 					db_set_dw(pDlg->m_hContact, CHAT_MODULE, "TrayIconMask", dwMask);
 				}
 				Chat_SetFilters(pDlg->m_si);
-				SendMessage(pDlg->GetHwnd(), GC_CHANGEFILTERFLAG, 0, iFlags);
+				pDlg->m_iLogFilterFlags = iFlags;
 				if (pDlg->m_bFilterEnabled)
 					SendMessage(pDlg->GetHwnd(), GC_REDRAWLOG, 0, 0);
 			}
@@ -2439,11 +2439,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 
-	case GC_CHANGEFILTERFLAG:
-		if (m_iLogFilterFlags == 0 && m_bFilterEnabled)
-			SendMessage(m_hwnd, WM_COMMAND, IDC_FILTER, 0);
-		break;
-
 	case GC_SHOWFILTERMENU:
 		m_hwndFilter = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), m_pContainer->hwnd, FilterWndProc, (LPARAM)this);
 		TranslateDialogDefault(m_hwndFilter);
@@ -3068,14 +3063,10 @@ void ShowRoom(SESSION_INFO *si)
 	if (M.FindWindow(hContact) != 0)
 		return;
 
-	if (hContact != 0 && M.GetByte("limittabs", 0) && !wcsncmp(pContainer->szName, L"default", 6)) {
-		if ((pContainer = FindMatchingContainer(L"default")) == nullptr) {
-			wchar_t szName[CONTAINER_NAMELEN + 1];
-			mir_snwprintf(szName, L"default");
-			if ((pContainer = CreateContainer(szName, CNT_CREATEFLAG_CLONED, hContact)) == nullptr)
+	if (hContact != 0 && M.GetByte("limittabs", 0) && !wcsncmp(pContainer->szName, L"default", 6))
+		if ((pContainer = FindMatchingContainer(L"default")) == nullptr)
+			if ((pContainer = CreateContainer(L"default", CNT_CREATEFLAG_CLONED, hContact)) == nullptr)
 				return;
-		}
-	}
 
 	wchar_t *contactName = pcli->pfnGetContactDisplayName(hContact, 0);
 
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 7a5ba87fde..d96426e630 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -615,7 +615,7 @@ INT_PTR CALLBACK CChatRoomDlg::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 			if (iFlags & GC_EVENT_ADDSTATUS)
 				iFlags |= GC_EVENT_REMOVESTATUS;
 
-			SendMessage(GetParent(hwndDlg), GC_CHANGEFILTERFLAG, 0, iFlags);
+			pDlg->m_iLogFilterFlags = iFlags;
 			if (pDlg->m_bFilterEnabled)
 				SendMessage(GetParent(hwndDlg), GC_REDRAWLOG, 0, 0);
 			PostMessage(hwndDlg, WM_CLOSE, 0, 0);
@@ -1507,10 +1507,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		UpdateTitle();
 		break;
 
-	case GC_CHANGEFILTERFLAG:
-		m_iLogFilterFlags = lParam;
-		break;
-
 	case GC_SHOWFILTERMENU:
 		{
 			HWND hwnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_FILTER), m_hwnd, FilterWndProc, (LPARAM)this);
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 758dd5a612..5c77fca204 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -77,6 +77,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define EM_SUBCLASSED (WM_USER+0x101)

 #define EM_ACTIVATE   (WM_USER+0x102)

 

+#define GC_SWITCHNEXTTAB (WM_USER+0x103)

+#define GC_SWITCHPREVTAB (WM_USER+0x104)

+#define GC_TABCHANGE     (WM_USER+0x105)

+#define GC_SWITCHTAB     (WM_USER+0x106)

+

 extern HINSTANCE g_hInst;

 extern HANDLE hHookWinEvt, hHookWinPopup, hHookWinWrite;

 extern CREOleCallback reOleCallback;