From 2b419ed6e80f65138a198f32a3ffe85bf39a5fcb Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 11 Mar 2017 16:33:16 +0300
Subject: GC_CLOSEWINDOW -> CloseTab()

---
 plugins/Scriver/src/chat/window.cpp | 4 ----
 plugins/Scriver/src/msgs.cpp        | 5 +++++
 plugins/Scriver/src/msgs.h          | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 4b1e6006db..740b4ff579 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1670,10 +1670,6 @@ INT_PTR CChatRoomDlg::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			DestroyMenu(hMenu);
 		}
 		break;
-
-	case GC_CLOSEWINDOW:
-		Close();
-		break;
 	}
 	return CScriverWindow::DlgProc(uMsg, wParam, lParam);
 }
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index fa0f0a6265..98908c14ee 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -366,6 +366,11 @@ CScriverWindow::CScriverWindow(int iDialog, SESSION_INFO *si)
 	m_autoClose = CLOSE_ON_CANCEL;
 }
 
+void CScriverWindow::CloseTab(bool)
+{
+	Close();
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // status icons processing
 
diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 873fd5ab90..55a97e5a83 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -91,6 +91,8 @@ protected:
 	CScriverWindow(int iDialog, SESSION_INFO* = nullptr);
 
 public:
+	virtual void CloseTab(bool bForced = false) override;
+
 	ParentWindowData *m_pParent;
 	int m_minLogBoxHeight, m_minEditBoxHeight;
 	HWND m_hwndIeview;
@@ -148,6 +150,7 @@ public:
 
 	virtual void OnInitDialog() override;
 	virtual void OnDestroy() override;
+	
 	virtual void UpdateTitle() override;
 
 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
@@ -190,6 +193,7 @@ public:
 	virtual void OnDestroy() override;
 
 	virtual INT_PTR DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
+	
 	virtual void UpdateTitle() override;
 
 	void onChange_Message(CCtrlEdit*);
-- 
cgit v1.2.3