menu item flag CMIF_ICONFROMICOLIB is ignored by the core from now on

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

4 files changed, 3 insertions, 8 deletions

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 42a1d0b016..a4b940bbbe 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -110,7 +110,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam)
 		mir_sntprintf(name, bufsize/sizeof(TCHAR), _T("%s (%s)"),FAVMENUROOTNAME,rates[bContactRate]);

 		mi.ptszName = name;            

 	}

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_ICONFROMICOLIB;

+	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

 	if ( !hFavoriteContactMenu) 

 		hFavoriteContactMenu = Menu_AddContactMenuItem(&mi);

 	else {

@@ -135,7 +135,7 @@ static int FAV_OnContactMenuBuild(WPARAM wParam,LPARAM lParam)
 	for (i=0; i < SIZEOF(rates); i++) {

 		mi.icolibItem = iconList[i].hIcolib;

 		mi.ptszName = rates[i];

-		mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i)?CMIF_CHECKED:0) | CMIF_ICONFROMICOLIB;

+		mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | ((bContactRate == i) ? CMIF_CHECKED : 0);

 		mi.pszService = CLUI_FAVSETRATE;

 		mi.popupPosition = i;

 		if (bModifyMenu && hFavoriteContactMenuItems[i]) {

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index b4339c7720..f99b24ca6d 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -612,7 +612,6 @@ void InitTrayMenus(void)
 	mi.position = 900000;

 	mi.pszService = "CloseAction";

 	mi.pszName = LPGEN("E&xit");

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_EXIT);

 	AddTrayMenuItem(0, (LPARAM)&mi);

 

diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp
index 1f0bdb8beb..c6cad48918 100644
--- a/plugins/Clist_modern/src/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/src/modern_cluiframes.cpp
@@ -827,7 +827,6 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid,int root,int popuppos,HGEN
 		return NULL;

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.pszPopupName = (char *)root;

 	mi.popupPosition = frameid;

 	mi.position = popuppos++;

@@ -1719,7 +1718,7 @@ static int CLUIFramesLoadMainMenu()
 

 	// create root menu

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTHANDLE;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME);

 	mi.position = 3000090000;

 	mi.pszName = LPGEN("Frames");

diff --git a/plugins/Clist_modern/src/modern_groupmenu.cpp b/plugins/Clist_modern/src/modern_groupmenu.cpp
index ab78f0f0b6..5f6ac01363 100644
--- a/plugins/Clist_modern/src/modern_groupmenu.cpp
+++ b/plugins/Clist_modern/src/modern_groupmenu.cpp
@@ -296,7 +296,6 @@ void GroupMenus_Init(void)
 	mi.pszService = "CloseAction";

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_EXIT);

 	mi.pszName = LPGEN("E&xit");

-	mi.flags = CMIF_ICONFROMICOLIB;

 	AddGroupMenuItem(0, (LPARAM)&mi);

 

 	mi.position = 500;

@@ -609,7 +608,6 @@ void InitSubGroupMenus(void)
 	memset(&mi, 0, sizeof(mi));

 	mi.cbSize = sizeof(mi);

 	mi.position = 900001;

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_RENAME);

 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

 	mi.pszName = LPGEN("&Rename Group");	

@@ -618,7 +616,6 @@ void InitSubGroupMenus(void)
 	DestroyIcon_protect(mi.hIcon);

 

 	mi.position = 900002;

-	mi.flags = CMIF_ICONFROMICOLIB;

 	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_DELETE);

 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

 	mi.pszName = LPGEN("&Delete Group");