From c625ddaf81f7481bffcd528ed3012fdc3a6bc8e1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 7 Nov 2012 14:53:21 +0000
Subject: EMPTY_EXTRA_ICON applied to all another plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@2232 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_mw/src/clcpaint.cpp    | 6 +++---
 plugins/Clist_mw/src/clcutils.cpp    | 6 +++---
 plugins/Clist_mw/src/commonheaders.h | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'plugins/Clist_mw')

diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp
index b74f3f7eb6..ea339a5975 100644
--- a/plugins/Clist_mw/src/clcpaint.cpp
+++ b/plugins/Clist_mw/src/clcpaint.cpp
@@ -487,7 +487,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 					//calc if extra icons present
 					int enabledextraicons = 0;
 					for (iImage = 0;iImage<dat->extraColumnsCount;iImage++) {
-						if (Drawing->iExtraImage[iImage] == 0xFFFF)
+						if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
 							continue;
 						enabledextraicons++;
 					}
@@ -543,7 +543,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 						COLORREF colourFg = dat->selBkColour;
 						int mode = ILD_NORMAL;
 
-						if (Drawing->iExtraImage[iImage] == 0xFFFF)
+						if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
 							continue;
 
 						if (selected) mode = ILD_SELECTED;
@@ -571,7 +571,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
 						int mode = ILD_NORMAL;
 						int x;
 
-						if (Drawing->iExtraImage[iImage] == 0xFFFF)
+						if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON)
 							continue;
 
 						if (hottrack) {
diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp
index aca0b80d1f..c7d467e889 100644
--- a/plugins/Clist_mw/src/clcutils.cpp
+++ b/plugins/Clist_mw/src/clcutils.cpp
@@ -90,9 +90,9 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact
 
 	cxSmIcon = GetSystemMetrics(SM_CXSMICON);
 
-	for (i = 0;i<dat->extraColumnsCount;i++) {
+	for (i=0; i < dat->extraColumnsCount; i++) {
 		int x;
-		if (hitcontact->iExtraImage[i] == 0xFFFF)
+		if (hitcontact->iExtraImage[i] == EMPTY_EXTRA_ICON)
 			continue;
 
 		if ((style & CLS_EX_MULTICOLUMNALIGNLEFT)) {							
@@ -106,7 +106,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact
 			if (dat->MetaIgnoreEmptyExtra) {
 				ir = 0;
 				for (int j = i;j<dat->extraColumnsCount;j++) 
-					if (hitcontact->iExtraImage[j] != 0xFFFF)
+					if (hitcontact->iExtraImage[j] != EMPTY_EXTRA_ICON)
 						ir++;
 			}
 			else ir = dat->extraColumnsCount-i;
diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h
index 1e6bccf2b0..0422ce93fa 100644
--- a/plugins/Clist_mw/src/commonheaders.h
+++ b/plugins/Clist_mw/src/commonheaders.h
@@ -56,6 +56,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_clistint.h>
 #include <m_skin.h>
 #include <m_contacts.h>
+#include <m_extraicons.h>
 #include "m_genmenu.h"
 #include "m_clui.h"
 
-- 
cgit v1.2.3