From 6f20ee4beb6b840ed81489358bca01ed41a0ea56 Mon Sep 17 00:00:00 2001
From: MikalaiR <nikolay.romanovich@narod.ru>
Date: Sun, 13 Sep 2015 14:32:38 +0000
Subject: Toaster: MS_POPUP_SHOWMEESGAE(W) support

git-svn-id: http://svn.miranda-ng.org/main/trunk@15344 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Toaster/src/stdafx.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'plugins/Toaster/src/stdafx.h')

diff --git a/plugins/Toaster/src/stdafx.h b/plugins/Toaster/src/stdafx.h
index 5c7537641d..a0b2a3509e 100644
--- a/plugins/Toaster/src/stdafx.h
+++ b/plugins/Toaster/src/stdafx.h
@@ -62,18 +62,29 @@ struct ToastData
 	MCONTACT hContact;
 	TCHAR *tszTitle;
 	TCHAR *tszText;
-	HICON hIcon;
-	bool bForcehIcon;
+	union
+	{
+		HICON hIcon;
+		HBITMAP hBitmap;
+	};
+	int iType; // 0 = none, 1 = hBitmap, 2 = hIcon
 
 	WNDPROC pPopupProc;
 	void *vPopupData;
 
-	ToastData(MCONTACT _hContact, const TCHAR *_tszTitle, const TCHAR *_tszText, HICON _hIcon = NULL, bool b = false) : 
+	ToastData(MCONTACT _hContact, const TCHAR *_tszTitle, const TCHAR *_tszText, HICON _hIcon = NULL) : 
 		hContact(_hContact),
 		tszTitle(mir_tstrdup(_tszTitle)), 
 		tszText(mir_tstrdup(_tszText)), 
 		hIcon(_hIcon), 
-		bForcehIcon(b) 
+		iType(_hIcon ? 2 : 0) 
+	{}
+	ToastData(MCONTACT _hContact, const TCHAR *_tszTitle, const TCHAR *_tszText, HBITMAP bmp = NULL) :
+		hContact(_hContact),
+		tszTitle(mir_tstrdup(_tszTitle)),
+		tszText(mir_tstrdup(_tszText)),
+		hBitmap(bmp),
+		iType(bmp ? 1 : 0)
 	{}
 	~ToastData()
 	{
-- 
cgit v1.2.3