EMPTY_EXTRA_ICON applied to all another plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@2232 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 8 insertions, 7 deletions

diff --git a/plugins/KeyboardNotify/src/Common.h b/plugins/KeyboardNotify/src/Common.h
index de4e3a89eb..406f5c14ad 100644
--- a/plugins/KeyboardNotify/src/Common.h
+++ b/plugins/KeyboardNotify/src/Common.h
@@ -55,6 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_clc.h>

 #include <m_skin.h>

 #include <win2k.h>

+#include <m_extraicons.h>

 

 #include "m_kbdnotify.h"

 #include <m_metacontacts.h>

diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp
index 0265a719fb..4d756e8b05 100644
--- a/plugins/KeyboardNotify/src/ignore.cpp
+++ b/plugins/KeyboardNotify/src/ignore.cpp
@@ -78,14 +78,14 @@ static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentIt
 			iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);

 			if(iconOn[i] && iImage == 0)

 				iconOn[i] = 0;

-			if(iImage != 0xFF)

+			if(iImage != EMPTY_EXTRA_ICON)

 				childCount[i]++;

 		}

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 	//set icons

 	for(i=0; i < SIZEOF(iconOn); i++) {

-		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+3:0):0xFF));

+		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+3:0):EMPTY_EXTRA_ICON));

 		if(groupChildCount)

 			groupChildCount[i] += childCount[i];

 	}

@@ -117,7 +117,7 @@ static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int
 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while(hItem) {

 		iOldIcon = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

-		if(iOldIcon != 0xFF && iOldIcon != iImage)

+		if(iOldIcon != EMPTY_EXTRA_ICON && iOldIcon != iImage)

 			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

@@ -144,7 +144,7 @@ static void SetIconsForColumn(HWND hwndList, HANDLE hItem, HANDLE hItemAll, int
 	itemType = SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hItem, 0);

 	if(itemType == CLCIT_CONTACT) {

 		int oldiImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

-		if (oldiImage != 0xFF && oldiImage != iImage)

+		if (oldiImage != EMPTY_EXTRA_ICON && oldiImage != iImage)

 			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

 	}

 	else if(itemType == CLCIT_INFO) {

@@ -180,7 +180,7 @@ static void SaveItemMask(HWND hwndList, HANDLE hContact, HANDLE hItem, const cha
 

 	for(i=0, mask=0; i < IGNOREEVENT_MAX; i++) {

 		iImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

-		if(iImage && iImage != 0xFF)

+		if(iImage && iImage != EMPTY_EXTRA_ICON)

 			mask |= 1<<i;

 	}

 	DBWriteContactSettingDword(hContact, KEYBDMODULE, pszSetting, mask);

@@ -195,7 +195,7 @@ static void SetAllContactIcons(HWND hwndList)
 	hContact=db_find_first();

 	do {

 		hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

-		if(hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == 0xFF) {

+		if(hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == EMPTY_EXTRA_ICON) {

 			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

 			if(szProto == NULL)

 				protoCaps = 0;

@@ -302,7 +302,7 @@ INT_PTR CALLBACK DlgProcIgnoreOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 								iImage = SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));

 								if(iImage == 0)

 									iImage = nm->iColumn + 3;

-								else if(iImage != 0xFF)

+								else if(iImage != EMPTY_EXTRA_ICON)

 									iImage = 0;

 								SetIconsForColumn(GetDlgItem(hwndDlg, IDC_LIST), hItem, hItemAll, nm->iColumn, iImage);

 							}