From 7ebc74088a674e52f523d2467997f3343eb7dc13 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 3 Sep 2019 14:54:55 +0300
Subject: unused shit removed

---
 src/core/stdmsg/src/msgdialog.cpp | 21 ++-------------------
 src/core/stdmsg/src/msgs.h        |  5 +----
 2 files changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 52519ebf1d..c2e461f57f 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -70,6 +70,7 @@ static void SetEditorText(HWND hwnd, const wchar_t *txt)
 CMsgDialog::CMsgDialog(CTabbedWindow *pOwner, int iDialogId, SESSION_INFO *si) :
 	CSuper(g_plugin, iDialogId, si),
 	m_btnOk(this, IDOK),
+	m_avatar(this, IDC_AVATAR),
 	m_splitterX(this, IDC_SPLITTERX),
 	m_splitterY(this, IDC_SPLITTERY),
 	m_pOwner(pOwner)
@@ -219,7 +220,6 @@ void CMsgDialog::StopFlash()
 
 CSrmmWindow::CSrmmWindow(CTabbedWindow *pOwner, MCONTACT hContact) :
 	CSuper(pOwner, IDD_MSG),
-	m_avatar(this, IDC_AVATAR),
 	m_cmdList(20),
 	m_bNoActivate(g_dat.bDoNotStealFocus)
 {
@@ -400,11 +400,6 @@ void CSrmmWindow::OnDestroy()
 	if (m_nTypeMode == PROTOTYPE_SELFTYPING_ON)
 		NotifyTyping(PROTOTYPE_SELFTYPING_OFF);
 
-	if (m_hBkgBrush)
-		DeleteObject(m_hBkgBrush);
-	if (m_hStatusIcon)
-		IcoLib_ReleaseIcon(m_hStatusIcon);
-
 	for (auto &it : m_cmdList)
 		mir_free(it);
 	m_cmdList.destroy();
@@ -515,11 +510,7 @@ void CSrmmWindow::OnOptionsApplied(bool bUpdateAvatar)
 	UpdateTitle();
 	Resize();
 
-	if (m_hBkgBrush)
-		DeleteObject(m_hBkgBrush);
-
 	COLORREF colour = g_plugin.getDword(SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR);
-	m_hBkgBrush = CreateSolidBrush(colour);
 	m_log.SendMsg(EM_SETBKGNDCOLOR, 0, colour);
 	m_message.SendMsg(EM_SETBKGNDCOLOR, 0, colour);
 
@@ -736,17 +727,9 @@ void CSrmmWindow::UpdateIcon(WPARAM wParam)
 		m_wStatus = cws->value.wVal;
 	}
 
-	if (!cws || bIsStatus) {
-		HICON hIcon = Skin_LoadProtoIcon(m_szProto, m_wStatus);
-		if (hIcon) {
-			if (m_hStatusIcon)
-				IcoLib_ReleaseIcon(m_hStatusIcon);
-			m_hStatusIcon = hIcon;
-		}
-
+	if (!cws || bIsStatus)
 		if (g_dat.bUseStatusWinIcon)
 			FixTabIcons();
-	}
 }
 
 void CSrmmWindow::UpdateLastMessage()
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index c96dffe46b..426cd76934 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -38,6 +38,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	friend class CTabbedWindow;
 
 protected:
+	CCtrlBase m_avatar;
 	CCtrlButton m_btnOk;
 	CSplitter m_splitterX, m_splitterY;
 
@@ -83,8 +84,6 @@ class CSrmmWindow : public CMsgDialog
 	LRESULT WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) override;
 	LRESULT WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) override;
 
-	CCtrlBase m_avatar;
-
 	void NotifyTyping(int mode);
 	void ProcessFileDrop(HDROP hDrop);
 	void ShowAvatar(void);
@@ -95,9 +94,7 @@ class CSrmmWindow : public CMsgDialog
 	void UpdateLastMessage(void);
 	void UpdateSizeBar(void);
 
-	HICON m_hStatusIcon = nullptr;
 	HFONT m_hFont = nullptr;
-	HBRUSH m_hBkgBrush = nullptr;
 
 	SIZE m_minEditBoxSize;
 	RECT m_minEditInit;
-- 
cgit v1.2.3