EMPTY_EXTRA_ICON applied to all another plugins

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

4 files changed, 19 insertions, 19 deletions

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 23776b5d6f..e515c57fa2 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -888,10 +888,10 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL
 			{

 				// if overlay - draw overlay icon

 				// position - on avatar

-				int x = szWnd.cx-ICON_WIDTH;

-				int y = szWnd.cy-ICON_HEIGHT;

+				int x = szWnd.cx - ICON_WIDTH;

+				int y = szWnd.cy - ICON_HEIGHT;

 				ske_ImageList_DrawEx(AniAva.overlayIconImageList,

-					dat->overlayIconIdx&0xFFFF,

+					dat->overlayIconIdx & 0xFFFF,

 					tempDC, x, y, ICON_WIDTH, ICON_HEIGHT,

 					CLR_NONE, CLR_NONE, ILD_NORMAL);

 			}

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 1faa3b03f9..f9623affa8 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -814,8 +814,8 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 				{

 					COLORREF colourFg = dat->selBkColour;

 					int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;

-					if (Drawing->iExtraImage[iImage] == 0xFFFF) {

-						x += ( x>0 )?dat->extraColumnSpacing:ICON_HEIGHT;

+					if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON) {

+						x += ( x>0 )?dat->extraColumnSpacing : ICON_HEIGHT;

 						SetRect( &rc, fr_rc.right-x, p_rect.top, fr_rc.right-x+ICON_HEIGHT, p_rect.bottom );

 						if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

 						Drawing->pos_extra[iImage] = rc;

@@ -840,7 +840,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 					if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, dx );

 					Drawing->pos_extra[iImage] = rc;

 					Drawing->pos_extra[iImage] = rc;

-					if (Drawing->iExtraImage[iImage] != 0xFFFF)

+					if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)

 						ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

 							rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

 				}

@@ -1577,7 +1577,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 						for ( iImage = 0; iImage < dat->extraColumnsCount ; iImage++ ) {

 							COLORREF colourFg = dat->selBkColour;

 							int mode = BlendedInActiveState?BlendValue:ILD_NORMAL;

-							if (Drawing->iExtraImage[iImage] == 0xFFFF) {

+							if (Drawing->iExtraImage[iImage] == EMPTY_EXTRA_ICON) {

 								if ( !dat->MetaIgnoreEmptyExtra) {

 									SetRect( &rc, p_rect.left+x, p_rect.top, p_rect.left+x+ICON_HEIGHT, p_rect.bottom );

 									x += dat->extraColumnSpacing;

@@ -1604,7 +1604,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 							count++;

 							if ( dat->text_rtl != 0 ) _RTLRect( &rc, free_row_rc.right, 0 );

 							Drawing->pos_extra[iImage] = rc;

-							if (Drawing->iExtraImage[iImage] != 0xFFFF)

+							if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)

 								ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

 									rc.left, rc.top, 0, 0, CLR_NONE, colourFg, mode );

 						}

@@ -1626,7 +1626,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 					{

 						int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;

 						if ( eNum < dat->extraColumnsCount )

-							if (Drawing->iExtraImage[eNum] != 0xFFFF) {

+							if (Drawing->iExtraImage[eNum] != EMPTY_EXTRA_ICON) {

 								int mode = 0;

 								int BlendedInActiveState = dat->dbbBlendInActiveState;

 								int BlendValue = dat->dbbBlend25 ? ILD_BLEND25 : ILD_BLEND50;

@@ -1648,7 +1648,7 @@ void CLCPaint::_PaintRowItemsEx( HWND hwnd, HDC hdcMem, struct ClcData *dat, Clc
 								}

 								if ( dat->text_rtl != 0 ) _RTLRect( &p_rect, free_row_rc.right, 0 );

 								Drawing->pos_extra[eNum] = p_rect;

-								if (Drawing->iExtraImage[eNum] != 0xFFFF)

+								if (Drawing->iExtraImage[eNum] != EMPTY_EXTRA_ICON)

 									ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[eNum], hdcMem, 

 										p_rect.left, p_rect.top, 0, 0, CLR_NONE, colourFg, mode );

 							}

@@ -2541,7 +2541,7 @@ void CLCPaint::_CalcItemsPos( HWND hwnd, HDC hdcMem, struct ClcData *dat, ClcCon
 					RECT rc;

 

 					for ( iImage = dat->extraColumnsCount-1 ; iImage >= 0 ; iImage-- ) {

-						if ( Drawing->iExtraImage[iImage] != 0xFFFF || !dat->MetaIgnoreEmptyExtra ) {

+						if ( Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra ) {

 							rc = _GetRectangle( dat, &row_rc, &free_row_rc, &left_pos, &right_pos, 

 								left, dat->extraColumnSpacing, dat->extraColumnSpacing, ICON_HEIGHT, 0 );

 							if (rc.left < rc.right) {

@@ -3244,7 +3244,7 @@ void CLCPaint::_DrawContactExtraIcon( HDC hdcMem, struct ClcData *dat, ClcContac
 		int mode;

 		COLORREF colourFg;

 		_GetBlendMode( dat, Drawing, selected, hottrack, GIM_EXTRAICON_AFFECT, &colourFg, &mode );

-		if (Drawing->iExtraImage[iImage] != 0xFFFF)

+		if (Drawing->iExtraImage[iImage] != EMPTY_EXTRA_ICON)

 			ske_ImageList_DrawEx( dat->himlExtraColumns, Drawing->iExtraImage[iImage], hdcMem, 

 				rc->left, rc->top, 0, 0, CLR_NONE, colourFg, mode );

 	}

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 411fa0234a..18defab4bd 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -259,7 +259,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact
 					BOOL hasExtra = FALSE;

 					int width = 0;

 					for (int k = 0; k < dat->extraColumnsCount; k++)

-						if (contact->iExtraImage[k] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

+						if (contact->iExtraImage[k] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra) {

 							hasExtra = TRUE;

 							if (item != -1) break;

 							width += (width>0)?dat->extraColumnSpacing:(dat->extraColumnSpacing-2);

@@ -285,7 +285,7 @@ int mod_CalcRowHeight_worker(struct ClcData *dat, HWND hwnd, ClcContact *contact
 				{

 					int eNum = gl_RowTabAccess[i]->type-TC_EXTRA1;

 					if (eNum < dat->extraColumnsCount)

-						if (contact->iExtraImage[eNum] != 0xFFFF || !dat->MetaIgnoreEmptyExtra) {

+						if (contact->iExtraImage[eNum] != EMPTY_EXTRA_ICON || !dat->MetaIgnoreEmptyExtra) {

 							gl_RowTabAccess[i]->h = ICON_HEIGHT;

 							gl_RowTabAccess[i]->w = ICON_HEIGHT;

 						}

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 8d795092b8..92f655f7a7 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -328,7 +328,7 @@ static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iIm
 	else 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) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,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);

 	}

 }

@@ -340,12 +340,12 @@ static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iCo
 	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) {

 		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));

 		if (hItem == hItemAll)

 			SetAllChildIcons(hwndList,hItem,iColumn,iImage);

@@ -354,7 +354,7 @@ static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iCo
 	}

 	else if (itemType == CLCIT_GROUP) {

 		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));

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

 		if (hItem)

@@ -972,7 +972,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 						iImage = SendDlgItemMessage(hwndDlg,IDC_CLIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));

 						if (iImage == nullImage)

 							iImage = nm->iColumn;

-						else if (iImage != 0xFF)

+						else if (iImage != EMPTY_EXTRA_ICON)

 							iImage = nullImage;

 						SetIconsForColumn(GetDlgItem(hwndDlg,IDC_CLIST),hItem,hInfoItem,nm->iColumn,iImage);

 						//SetListGroupIcons(GetDlgItem(hwndDlg,IDC_CLIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hInfoItem,NULL);