- SRMM window list management moved to the base class;

- fixes #791

5 files changed, 0 insertions, 17 deletions

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index d73ca8f181..8e97de36f9 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -615,8 +615,6 @@ void CChatRoomDlg::OnDestroy()
 		m_sbCustom = 0;
 	}
 
-	M.RemoveWindow(m_hwnd);
-
 	NotifyEvent(MSG_WINDOW_EVT_CLOSE);
 
 	m_pContainer->ClearMargins();
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 1737500343..f1c4e258e8 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -69,16 +69,6 @@ HWND CMimAPI::FindWindow(MCONTACT h) const
 	return WindowList_Find(pci->hWindowList, h);
 }
 
-INT_PTR CMimAPI::AddWindow(HWND hWnd, MCONTACT h)
-{
-	return WindowList_Add(pci->hWindowList, hWnd, h);
-}
-
-INT_PTR CMimAPI::RemoveWindow(HWND hWnd)
-{
-	return WindowList_Remove(pci->hWindowList, hWnd);
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////
 
 int CMimAPI::FoldersPathChanged(WPARAM, LPARAM)
diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h
index 5210cc4b25..183b96b6a6 100644
--- a/plugins/TabSRMM/src/mim.h
+++ b/plugins/TabSRMM/src/mim.h
@@ -181,8 +181,6 @@ public:
 	// window lists

 	void     BroadcastMessage(UINT msg, WPARAM wParam, LPARAM lParam);

 	void     BroadcastMessageAsync(UINT msg, WPARAM wParam, LPARAM lParam);

-	INT_PTR  AddWindow(HWND hWnd, MCONTACT h);

-	INT_PTR  RemoveWindow(HWND hWnd);

 	HWND     FindWindow(MCONTACT h) const;

 

 	static	int FoldersPathChanged(WPARAM wParam, LPARAM lParam);		// hook subscriber for folders plugin

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 9646963098..55e362f9f8 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -932,7 +932,6 @@ void CSrmmWindow::OnDestroy()
 	UpdateTrayMenuState(this, FALSE);               // remove me from the tray menu (if still there)

 	if (PluginConfig.g_hMenuTrayUnread)

 		DeleteMenu(PluginConfig.g_hMenuTrayUnread, m_hContact, MF_BYCOMMAND);

-	M.RemoveWindow(m_hwnd);

 

 	if (m_cache->isValid())

 		db_set_dw(0, SRMSGMOD, "multisplit", m_iMultiSplit);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 5d3799b8a3..57e6949b92 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -96,7 +96,6 @@ void CTabBaseDlg::LoadSettings()
 void CTabBaseDlg::OnInitDialog()

 {

 	CSrmmBaseDialog::OnInitDialog();

-	SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this);

 

 	// m_hwnd is valid, pass it to the tab control

 	TCITEM tci;

@@ -108,7 +107,6 @@ void CTabBaseDlg::OnInitDialog()
 	m_pContainer->UpdateTabs();

 	

 	// add this window to window list & proxy

-	M.AddWindow(m_hwnd, m_hContact);

 	CProxyWindow::add(this);

 

 	// set up Windows themes