obsoleted constants CMIF_ROOTPOPUP & CMIF_CHILDPOPUP replaced with CMIF_ROOTHANDLE

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

36 files changed, 137 insertions, 141 deletions

diff --git a/include/m_clist.h b/include/m_clist.h
index 82c11dd553..22d3a5634b 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -139,10 +139,6 @@ struct CLISTMENUITEM
 //#define CMIF_ICONFROMICOLIB  2048 // use icolibName instead of hIcon, unused

 #define CMIF_DEFAULT           4096 // this menu item is the default one

 

-// for compatibility. since 0.8.0 they both mean nothing

-#define CMIF_ROOTPOPUP  128   //root item for new popup(save return id for childs)

-#define CMIF_CHILDPOPUP 256   //child for rootpopup menu

-

 __forceinline HGENMENU Menu_AddMainMenuItem(CLISTMENUITEM *mi)

 {	mi->hLangpack = hLangpack;

 	return (HGENMENU)CallService("CList/AddMainMenuItem", 0, (LPARAM)mi);

diff --git a/include/m_genmenu.h b/include/m_genmenu.h
index 78ea963bbd..a4c30fe509 100644
--- a/include/m_genmenu.h
+++ b/include/m_genmenu.h
@@ -318,8 +318,8 @@ __forceinline HANDLE MO_CreateMenuObject(LPCSTR szName, LPCSTR szDisplayName, LP
 #define MCO_OPT_USERDEFINEDITEMS 1

 

 // Set FreeService for menuobject. When freeing menuitem it will be called with

-// wParam=MenuItemHandle

-// lParam=mi.ownerdata

+// wParam = MenuItemHandle

+// lParam = mi.ownerdata

 #define MCO_OPT_FREE_SERVICE 2

 

 // Set onAddService for menuobject.

diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index 0bb43e1036..85fec4f606 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -122,7 +122,7 @@ void InitTaskMenuItems()
 		if (hTaskMainMenu == NULL) {

 			CLISTMENUITEM mi = { 0 };

 			mi.position = 500060005;

-			mi.flags = CMIF_ROOTPOPUP;

+			mi.flags = CMIF_ROOTHANDLE;

 			mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

 			mi.pszName = LPGEN("Execute history task");

 			hTaskMainMenu = Menu_AddMainMenuItem(&mi);

@@ -139,7 +139,7 @@ void InitTaskMenuItems()
 		int pos = (int)taskMenus.size();

 		for (; taskIt != Options::instance->taskOptions.end(); ++taskIt) {

 			CLISTMENUITEM mi = { 0 };

-			mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+			mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 			mi.pszService = MS_HISTORY_EXECUTE_TASK;

 			mi.hParentMenu = hTaskMainMenu;

 			mi.popupPosition = pos++;

diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 68119b7f9b..2c0fe38f0a 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -239,7 +239,7 @@ void addProtoStatusMenuItem(char *protoName)
 		CreateServiceFunctionParam(buf, showList, (LPARAM)protoName);
 
 	CLISTMENUITEM mi = { 0 };
-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;
 	mi.icolibItem = forms[0].hIcoLibItem;
 	mi.ptszName = _T(MODULENAME);
 	mi.position = 2000040000;
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index c3240e099b..ce772bdc54 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -766,7 +766,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	mi.popupPosition = frameid;

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Visible");

-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SHFRAME;

 	menuid = pfnAdd(&mi);

 	if (frameid == -1) _hmiVisible = menuid;

@@ -798,7 +798,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	// floating

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Floating mode");

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszService = "Set_Floating";

 	menuid = pfnAdd(&mi);

 	if (frameid == -1) _hmiFloating = menuid;

@@ -806,7 +806,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Border");

-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;

 	mi.pszService = MS_CLIST_FRAMES_SETUNBORDER;

 	menuid = pfnAdd(&mi);

 	if (frameid == -1) _hmiBorder = menuid;

@@ -817,13 +817,13 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	// alignment root

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Align");

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;

 	mi.pszService = "";

 	menuid = pfnAdd(&mi);

 	if (frameid == -1) _hmiAlignRoot = menuid;

 	else g_pfwFrames[framepos].MenuHandles.MIAlignRoot = menuid;

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 

 	// align top

 	mi.hParentMenu = menuid;

@@ -858,7 +858,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	mi.hParentMenu = root;

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Position");

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;

 	mi.pszService = "";

 	mi.pszContactOwner = (char*)0;

 	menuid = pfnAdd(&mi);

@@ -868,7 +868,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	mi.hParentMenu = menuid;

 	mi.position = popuppos++;

 	mi.pszName = LPGEN("&Up");

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszService = CLUIFRAMESMOVEUP;

 	mi.pszContactOwner = (char*)1;

 	menuid = pfnAdd(&mi);

@@ -894,21 +894,21 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam, LPARAM)
 	if (pos >= 0 && pos < g_nFramesCount) {

 		FRAMEWND &p = g_pfwFrames[pos];

 

-		Menu_ModifyItem(_hmiVisible, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.visible) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(_hmiLock, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.Locked) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(_hmiTBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(_hmiFloating, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.floating) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiVisible, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.visible) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiLock, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.Locked) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiTBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiFloating, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.floating) ? CMIF_CHECKED : 0);

 

-		int flags = CMIF_CHILDPOPUP;

+		int flags = CMIF_ROOTHANDLE;

 		if (g_CluiData.fLayered) flags += CMIF_GRAYED;

 		else if ((p.UseBorder)) flags += CMIF_CHECKED;

 		Menu_ModifyItem(_hmiBorder, NULL, INVALID_HANDLE_VALUE, flags);

 

-		Menu_ModifyItem(_hmiAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.align&alTop) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(_hmiAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.align&alClient) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(_hmiAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.align&alBottom) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.align&alTop) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.align&alClient) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(_hmiAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.align&alBottom) ? CMIF_CHECKED : 0);

 

-		flags = CMIF_CHILDPOPUP;

+		flags = CMIF_ROOTHANDLE;

 		if (p.collapsed) flags += CMIF_CHECKED;

 		if ((!p.visible) || (p.Locked) || (pos == CLUIFramesGetalClientFrame())) flags += CMIF_GRAYED;

 		Menu_ModifyItem(_hmiColl, NULL, INVALID_HANDLE_VALUE, flags);

@@ -926,21 +926,21 @@ static int CLUIFramesModifyMainMenuItems(WPARAM wParam, LPARAM)
 	if (pos >= 0 && pos < g_nFramesCount) {

 		FRAMEWND &p = g_pfwFrames[pos];

 		

-		Menu_ModifyItem(p.MenuHandles.MIVisible, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.visible) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(p.MenuHandles.MILock, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.Locked) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(p.MenuHandles.MITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(p.MenuHandles.MIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.floating) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MIVisible, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.visible) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MILock, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.Locked) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.floating) ? CMIF_CHECKED : 0);

 

-		int flags = CMIF_CHILDPOPUP;

+		int flags = CMIF_ROOTHANDLE;

 		if (g_CluiData.fLayered) flags += CMIF_GRAYED;

 		else if (p.UseBorder) flags += CMIF_CHECKED;

 		Menu_ModifyItem(p.MenuHandles.MIBorder, NULL, INVALID_HANDLE_VALUE, flags);

 

-		Menu_ModifyItem(p.MenuHandles.MIAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.align & alClient) ? CMIF_GRAYED : 0) + (p.align & alTop) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(p.MenuHandles.MIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.align & alClient) ? CMIF_CHECKED : 0);

-		Menu_ModifyItem(p.MenuHandles.MIAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.align & alClient) ? CMIF_GRAYED : 0) + (p.align & alBottom) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MIAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.align & alClient) ? CMIF_GRAYED : 0) + (p.align & alTop) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.align & alClient) ? CMIF_CHECKED : 0);

+		Menu_ModifyItem(p.MenuHandles.MIAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.align & alClient) ? CMIF_GRAYED : 0) + (p.align & alBottom) ? CMIF_CHECKED : 0);

 		

-		flags = CMIF_CHILDPOPUP + (p.collapsed) ? CMIF_CHECKED : 0 + ((!p.visible) || p.Locked || (pos == CLUIFramesGetalClientFrame())) ? CMIF_GRAYED : 0;

+		flags = CMIF_ROOTHANDLE + (p.collapsed) ? CMIF_CHECKED : 0 + ((!p.visible) || p.Locked || (pos == CLUIFramesGetalClientFrame())) ? CMIF_GRAYED : 0;

 		Menu_ModifyItem(p.MenuHandles.MIColl, NULL, INVALID_HANDLE_VALUE, flags);

 	}

 

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 0962902ba1..22bc5e14ab 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -103,7 +103,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 	mi.icolibItem = iconList[bContactRate].hIcolib;

 	mi.hParentMenu = HGENMENU_ROOT;

 	mi.position = 0;

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	if (!bContactRate)

 		mi.ptszName = FAVMENUROOTNAME;

 	else {

@@ -131,7 +131,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 

 	int i;

 	for (i = 0; i < _countof(rates); i++) {

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

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

 		if (bModifyMenu && hFavoriteContactMenuItems[i])

 			Menu_ModifyItem(hFavoriteContactMenuItems[i], NULL, iconList[i].hIcolib, mi.flags);

 		else {

@@ -144,7 +144,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 	}

 

 	mi.hIcon = NULL;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | (db_get_b(hContact, "CList", "noOffline", 0) ? CMIF_CHECKED : 0);

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | (db_get_b(hContact, "CList", "noOffline", 0) ? CMIF_CHECKED : 0);

 	if (bModifyMenu && hShowIfOflineItem)

 		Menu_ModifyItem(hShowIfOflineItem, NULL, INVALID_HANDLE_VALUE, mi.flags);

 	else {

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index e791c07baa..f8a7a573ae 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -587,7 +587,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.hParentMenu = root;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&FrameTitle");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_GRAYED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_GRAYED;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMITitle = menuid;
 	else Frames[framepos].MenuHandles.MITitle = menuid;
@@ -597,7 +597,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.hIcon = NULL;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Visible");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_SHFRAME;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIVisible = menuid;
@@ -605,7 +605,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Show title bar");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_SHFRAMETITLEBAR;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMITBVisible = menuid;
@@ -615,7 +615,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Locked");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_ULFRAME;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMILock = menuid;
@@ -623,7 +623,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Collapsed");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_UCOLLFRAME;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIColl = menuid;
@@ -632,7 +632,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	// floating
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Floating mode");
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = "Set_Floating";
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIFloating = menuid;
@@ -642,7 +642,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Border");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_SETUNBORDER;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIBorder = menuid;
@@ -652,7 +652,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Skinned frame");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_CHECKED;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_CHECKED;
 	mi.pszService = MS_CLIST_FRAMES_SETSKINNED;
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMISkinned = menuid;
@@ -664,13 +664,13 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.hParentMenu = root;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Align");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	menuid = pfnAdd(&mi);
 	if (frameid == -1) contMIAlignRoot = menuid;
 	else Frames[framepos].MenuHandles.MIAlignRoot = menuid;
 
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	// align top
 	mi.hParentMenu = menuid;
 	mi.position = popuppos++;
@@ -704,7 +704,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.popupPosition = frameid;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Position");
-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTPOPUP;
+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;
 	mi.pszService = "";
 	mi.pszContactOwner = (char*)0;
 	menuid = pfnAdd(&mi);
@@ -712,14 +712,14 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, HGE
 	mi.hParentMenu = menuid;
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Up");
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = CLUIFRAMESMOVEUP;
 	mi.pszContactOwner = (char*)1;
 	pfnAdd(&mi);
 
 	mi.position = popuppos++;
 	mi.pszName = LPGEN("&Down");
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszService = CLUIFRAMESMOVEDOWN;
 	mi.pszContactOwner = (char*)-1;
 	pfnAdd(&mi);
@@ -735,18 +735,18 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam, LPARAM)
 	int pos = id2pos((INT_PTR)wParam);
 	if (pos >= 0 && pos < nFramescount) {
 		FRAMEWND &p = Frames[pos];
-		Menu_ModifyItem(contMITitle, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP);
-		Menu_ModifyItem(contMIVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.visible ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMILock, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.Locked ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.TitleBar.ShowTitleBar ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.floating ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMIBorder, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.UseBorder ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMISkinned, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.Skinned ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMIAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.align & alTop) ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.align & alClient) ? CMIF_CHECKED : 0));
-		Menu_ModifyItem(contMIAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.align & alBottom) ? CMIF_CHECKED : 0));
-
-		int flags = CMIF_CHILDPOPUP + (!p.collapsed ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(contMITitle, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE);
+		Menu_ModifyItem(contMIVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.visible ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMILock, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.Locked ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.TitleBar.ShowTitleBar ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.floating ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMIBorder, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.UseBorder ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMISkinned, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.Skinned ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMIAlignTop, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.align & alTop) ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.align & alClient) ? CMIF_CHECKED : 0));
+		Menu_ModifyItem(contMIAlignBottom, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.align & alBottom) ? CMIF_CHECKED : 0));
+
+		int flags = CMIF_ROOTHANDLE + (!p.collapsed ? CMIF_CHECKED : 0);
 		if ((!p.visible) || (p.Locked) || (pos == CLUIFramesGetalClientFrame()))
 			flags |= CMIF_GRAYED;
 		Menu_ModifyItem(contMIColl, NULL, INVALID_HANDLE_VALUE, flags);
@@ -764,26 +764,26 @@ INT_PTR CLUIFramesModifyMainMenuItems(WPARAM wParam, LPARAM)
 
 	if (pos >= 0 && pos < nFramescount) {
 		FRAMEWND &p = Frames[pos];
-		Menu_ModifyItem(p.MenuHandles.MITitle, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP);
+		Menu_ModifyItem(p.MenuHandles.MITitle, p.TitleBar.tbname ? p.TitleBar.tbname : p.name, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE);
 
-		Menu_ModifyItem(p.MenuHandles.MIVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.visible) ? CMIF_CHECKED : 0);
-		Menu_ModifyItem(p.MenuHandles.MILock, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.Locked) ? CMIF_CHECKED : 0);
-		Menu_ModifyItem(p.MenuHandles.MITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);
-		Menu_ModifyItem(p.MenuHandles.MIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.floating) ? CMIF_CHECKED : 0);
-		Menu_ModifyItem(p.MenuHandles.MIBorder, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.UseBorder)) ? CMIF_CHECKED : 0);
-		Menu_ModifyItem(p.MenuHandles.MISkinned, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + ((p.Skinned)) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MIVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.visible) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MILock, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.Locked) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MITBVisible, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.TitleBar.ShowTitleBar) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MIFloating, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.floating) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MIBorder, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.UseBorder)) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MISkinned, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + ((p.Skinned)) ? CMIF_CHECKED : 0);
 
-		int flags = CMIF_CHILDPOPUP | ((p.align & alClient) ? CMIF_GRAYED : 0);
+		int flags = CMIF_ROOTHANDLE | ((p.align & alClient) ? CMIF_GRAYED : 0);
 		if (p.align & alTop) flags |= CMIF_CHECKED;
 		Menu_ModifyItem(p.MenuHandles.MIAlignTop, NULL, INVALID_HANDLE_VALUE, flags);
 
-		Menu_ModifyItem(p.MenuHandles.MIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_CHILDPOPUP + (p.align & alClient) ? CMIF_CHECKED : 0);
+		Menu_ModifyItem(p.MenuHandles.MIAlignClient, NULL, INVALID_HANDLE_VALUE, CMIF_ROOTHANDLE + (p.align & alClient) ? CMIF_CHECKED : 0);
 
-		flags = CMIF_CHILDPOPUP | ((p.align & alClient) ? CMIF_GRAYED : 0);
+		flags = CMIF_ROOTHANDLE | ((p.align & alClient) ? CMIF_GRAYED : 0);
 		if (p.align & alBottom) flags |= CMIF_CHECKED;
 		Menu_ModifyItem(p.MenuHandles.MIAlignBottom, NULL, INVALID_HANDLE_VALUE, flags);
 
-		flags = CMIF_CHILDPOPUP;
+		flags = CMIF_ROOTHANDLE;
 		if ( !p.collapsed) flags |= CMIF_CHECKED;
 		if ((!p.visible) || p.Locked || (pos == CLUIFramesGetalClientFrame())) flags |= CMIF_GRAYED;
 		Menu_ModifyItem(p.MenuHandles.MIColl, NULL, INVALID_HANDLE_VALUE, flags);
@@ -1427,7 +1427,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP));
 	mi.position = separator++;
 	mi.hParentMenu = MainMIRoot;
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Show all title bars");
 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;
 	Menu_AddMainMenuItem(&mi);
@@ -1436,7 +1436,7 @@ static int CLUIFramesLoadMainMenu()
 	mi.hIcon = NULL;//LoadIcon(g_hInst,MAKEINTRESOURCE(IDI_HELP));
 	mi.position = separator++;
 	mi.hParentMenu = MainMIRoot;
-	mi.flags = CMIF_CHILDPOPUP;
+	mi.flags = CMIF_ROOTHANDLE;
 	mi.pszName = LPGEN("Hide all title bars");
 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;
 	Menu_AddMainMenuItem(&mi);
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 1362e43908..3ab828ca0f 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -258,13 +258,13 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { 0 };

 	mi.popupPosition = 2000089999;

 	mi.position = 2000089999;

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = GetIconHandle(IDI_VI);

 	mi.ptszName = LPGENT("Version Information");

 	mi.hParentMenu = HGENMENU_ROOT;

 	HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);

 

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = hMenuRoot;

 	mi.popupPosition = 0;

 

diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp
index e1f327433e..003f81ec97 100644
--- a/plugins/FTPFileYM/src/ftpfile.cpp
+++ b/plugins/FTPFileYM/src/ftpfile.cpp
@@ -92,7 +92,7 @@ void InitMenuItems()
 	TCHAR stzName[256];

 

 	CLISTMENUITEM mi = { 0 };

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib;

 	mi.position = 3000090001;

 	mi.ptszName = LPGENT("FTP File");

@@ -105,7 +105,7 @@ void InitMenuItems()
 	mi.ptszName = stzName;

 

 	CLISTMENUITEM mi2 = { 0 };

-	mi2.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR;

+	mi2.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi2.pszService = MS_FTPFILE_CONTACTMENU;

 

 	for (int i = 0; i < ServerList::FTP_COUNT; i++) 

@@ -117,7 +117,7 @@ void InitMenuItems()
 		mi.hParentMenu = 0; 

 		if (opt.bUseSubmenu)

 		{

-			mi.flags |= CMIF_CHILDPOPUP | CMIF_ROOTHANDLE;

+			mi.flags |= CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;

 			mi.hParentMenu = hMenu;

 		}

 

@@ -125,7 +125,7 @@ void InitMenuItems()
 		mi.popupPosition = i + 1000;

 		hSubMenu[i] = Menu_AddContactMenuItem(&mi);

 

-		mi.flags |= CMIF_CHILDPOPUP | CMIF_ROOTHANDLE;

+		mi.flags |= CMIF_ROOTHANDLE | CMIF_ROOTHANDLE;

 		mi.hParentMenu = hMainMenu;

 		hMainSubMenu[i] = Menu_AddMainMenuItem(&mi);

 		

@@ -161,7 +161,7 @@ void InitMenuItems()
 	}

 

 	memset(&mi, 0, sizeof(mi));

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = iconList[ServerList::FTP_COUNT].hIcolib;

 	mi.position = 3000090001;

 	mi.ptszName = LPGENT("FTP File manager");

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index f8bcb8f8b6..c45188b971 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -196,7 +196,7 @@ void RebuildMenu()
 		mi.popupPosition = 500080000 + i;

 		mi.pszService = MS_LISTENINGTO_MAINMENU;

 		mi.ptszName = text;

-		mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR

 				| (ListeningToEnabled(info->proto, TRUE) ? CMIF_CHECKED : 0)

 				| (opts.enable_sending ? 0 : CMIF_GRAYED);

 

@@ -294,7 +294,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { 0 };

 	mi.position = 500080000;

 	mi.ptszName = LPGENT("Listening to");

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = iconList[0].hIcolib;

 	hMainMenuGroup = Menu_AddMainMenuItem(&mi);

 

@@ -306,7 +306,7 @@ int ModulesLoaded(WPARAM, LPARAM)
 

 	// Add all protos

 	mi.ptszName = LPGENT("Send to all protocols");

-	mi.flags = CMIF_CHILDPOPUP  | CMIF_TCHAR

+	mi.flags = CMIF_ROOTHANDLE  | CMIF_TCHAR

 			| (ListeningToEnabled(NULL, TRUE) ? CMIF_CHECKED : 0)

 			| (opts.enable_sending ? 0 : CMIF_GRAYED);

 	proto_items.resize(1);

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index e7ab90d826..08f86255bf 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -740,7 +740,7 @@ static HGENMENU AddSubmenuItem(HGENMENU hRoot, TCHAR* name, HICON icon, DWORD fl
 	mi.position = pos;

 	mi.ptszName = name;

 	mi.hIcon = icon;

-	mi.flags = CMIF_UNICODE | CMIF_CHILDPOPUP | flag;

+	mi.flags = CMIF_UNICODE | CMIF_ROOTHANDLE | flag;

 	mi.pszService = service;

 	return Menu_AddContactMenuItem(&mi);

 }

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index f9d321e780..0dea853ec2 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -88,12 +88,12 @@ static int MainInit(WPARAM, LPARAM)
 	// Add options to menu

 	CLISTMENUITEM mi = { 0 };

 	mi.popupPosition = 500050000;

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

 	mi.ptszName = LPGENT("My details");

 	HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);

 

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = hMenuRoot;

 	mi.popupPosition = 0;

 	mi.icolibItem = NULL;

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index 8749b97ee9..5eab194bd1 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -636,14 +636,14 @@ int MirandaLoaded(WPARAM, LPARAM)
 		g_hContactMenuItem = Menu_AddContactMenuItem(&mi);

 

 		memset(&mi, 0, sizeof(mi));

-		mi.flags = CMIF_TCHAR | CMIF_ROOTPOPUP;

+		mi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE;

 		mi.hIcon = NULL;

 		mi.hParentMenu = HGENMENU_ROOT;

 		mi.position = 1000020000;

 		mi.ptszName = LPGENT("Autoreply");

 		g_hToggleSOEContactMenuItem = Menu_AddContactMenuItem(&mi);

 

-		mi.flags = CMIF_TCHAR | CMIF_CHILDPOPUP;

+		mi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE;

 		mi.hParentMenu = g_hToggleSOEContactMenuItem;

 		mi.popupPosition = 1000020000;

 		mi.position = 1000020000;

diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp
index 3ed7dd848b..772d82c3a6 100644
--- a/plugins/PasteIt/src/PasteIt.cpp
+++ b/plugins/PasteIt/src/PasteIt.cpp
@@ -292,7 +292,7 @@ INT_PTR ContactMenuService(WPARAM hContact, LPARAM lParam)
 void InitMenuItems()

 {

 	CLISTMENUITEM mi = { 0 };

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = icon.hIcolib;

 	mi.position = 3000090005;

 	mi.ptszName = LPGENT("Paste It");

@@ -300,7 +300,7 @@ void InitMenuItems()
 	hContactMenu = Menu_AddContactMenuItem(&mi);

 

 	memset(&mi, 0, sizeof(mi));

-	mi.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.pszService = MS_PASTEIT_CONTACTMENU;

 	mi.hParentMenu = hContactMenu;

 	mi.popupPosition = FROM_CLIPBOARD;

@@ -320,7 +320,7 @@ void InitMenuItems()
 	mi2.hParentMenu = hDefWebMenu;

 	for (int i = 0; i < PasteToWeb::pages; ++i)

 	{

-		mi2.flags = CMIF_CHILDPOPUP | CMIF_ROOTHANDLE | CMIF_TCHAR;

+		mi2.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_TCHAR;

 		if (Options::instance->defWeb == i)

 			mi2.flags |= CMIF_CHECKED;

 		mi2.ptszName = pasteToWebs[i]->GetName();

diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index d565deff7a..c51d077bb7 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -85,7 +85,7 @@ namespace
 	{

 		CLISTMENUITEM mi = { 0 };

 		mi.ptszName = LPGENT("Quotes");

-		mi.flags = CMIF_TCHAR | CMIF_ROOTPOPUP;

+		mi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN);

 		HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);

 

@@ -143,7 +143,7 @@ namespace
 		{

 			mi.pszPopupName = (char *)-1;

 			mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN);

-			mi.flags = CMIF_TCHAR | CMIF_ROOTPOPUP;

+			mi.flags = CMIF_TCHAR | CMIF_ROOTHANDLE;

 			tstring sProtocolName = quotes_a2t(QUOTES_PROTOCOL_NAME);

 			mi.ptszName = const_cast<TCHAR*>(sProtocolName.c_str());//A2T(QUOTES_PROTOCOL_NAME);

 			mi.position = 0;

@@ -154,7 +154,7 @@ namespace
 		mi.flags = CMIF_TCHAR;

 		if (bSubGroups)

 		{

-			mi.flags |= CMIF_CHILDPOPUP;

+			mi.flags |= CMIF_ROOTHANDLE;

 			mi.pszPopupName = (char*)hMenuRoot;

 		}

 

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 5f1eb6be5b..a7f46db025 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -51,7 +51,7 @@ static HGENMENU AddMenuItem(LPCSTR name, int pos, HICON hicon, LPCSTR service, i
 static HGENMENU AddSubItem(HANDLE rootid, LPCSTR name, int pos, int poppos, LPCSTR service, WPARAM wParam = 0)

 {

 	CLISTMENUITEM mi = { 0 };

-	mi.flags = CMIF_CHILDPOPUP | CMIF_HIDDEN;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_HIDDEN;

 	mi.position = pos;

 	mi.popupPosition = poppos;

 	mi.pszName = (char*)name;

@@ -234,7 +234,7 @@ static int onModulesLoaded(WPARAM, LPARAM)
 	g_hMenu[1] = AddMenuItem(sim302, 110001, g_hICO[ICO_CM_DIS], MODULENAME"/SIM_DIS", CMIF_NOTOFFLINE);

 

 	if (ServiceExists(MS_CLIST_MENUBUILDSUBGROUP)) {

-		g_hMenu[2] = AddMenuItem(sim312[0], 110002, NULL, NULL, CMIF_ROOTPOPUP);

+		g_hMenu[2] = AddMenuItem(sim312[0], 110002, NULL, NULL, CMIF_ROOTHANDLE);

 		g_hMenu[3] = AddSubItem(g_hMenu[2], sim232[0], 110003, 110002, MODULENAME"/SIM_ST_DIS");

 		g_hMenu[4] = AddSubItem(g_hMenu[2], sim232[1], 110004, 110002, MODULENAME"/SIM_ST_ENA");

 		g_hMenu[5] = AddSubItem(g_hMenu[2], sim232[2], 110005, 110002, MODULENAME"/SIM_ST_TRY");

@@ -257,7 +257,7 @@ static int onModulesLoaded(WPARAM, LPARAM)
 	}

 

 	if (ServiceExists(MS_CLIST_MENUBUILDSUBGROUP)) {

-		g_hMenu[10] = AddMenuItem(sim311[0], 110010, NULL, NULL, CMIF_ROOTPOPUP);

+		g_hMenu[10] = AddMenuItem(sim311[0], 110010, NULL, NULL, CMIF_ROOTHANDLE);

 		g_hMenu[11] = AddSubItem(g_hMenu[10], sim231[0], 110011, 110010, MODULENAME"/MODE_NAT");

 		g_hMenu[12] = AddSubItem(g_hMenu[10], sim231[1], 110012, 110010, MODULENAME"/MODE_PGP");

 		g_hMenu[13] = AddSubItem(g_hMenu[10], sim231[2], 110013, 110010, MODULENAME"/MODE_GPG");

diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp
index b658a5333d..44aed70e7e 100644
--- a/plugins/SmileyAdd/src/main.cpp
+++ b/plugins/SmileyAdd/src/main.cpp
@@ -51,7 +51,7 @@ static IconItem icon = { LPGEN("Button smiley"), "SmileyAdd_ButtonSmiley", IDI_S
 static int ModulesLoaded(WPARAM, LPARAM)

 {

 	CLISTMENUITEM mi = { 0 };

-	mi.flags = CMIF_ROOTPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.popupPosition = 2000070050;

 	mi.position = 2000070050;

 	mi.icolibItem = icon.hIcolib;

diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index cb9b4bb884..16e483c17b 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -294,7 +294,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM)
 

 		CLISTMENUITEM mi = { 0 };

 		mi.hParentMenu = hContactMenuItem;

-		mi.flags       = CMIF_CHILDPOPUP | CMIF_TCHAR;

+		mi.flags       = CMIF_ROOTHANDLE | CMIF_TCHAR;

 		mi.pszService  = MS_SMILEYADD_CUSTOMCATMENU;

 

 		bool nonecheck = true;

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index f23004803d..d4ba6ebfea 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -216,7 +216,7 @@ void CAimProto::InitMainMenus(void)
 

 	HGENMENU hRoot = Menu_GetProtocolRoot(m_szModuleName);

 	if (hRoot == NULL) {

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = GetIconHandle("aim");

 		mi.ptszName = m_tszUserName;

 		mi.hParentMenu = HGENMENU_ROOT;

@@ -233,7 +233,7 @@ void CAimProto::InitMainMenus(void)
 

 	mi.pszService = service_name;

 	mi.hParentMenu = hRoot;

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 

 	mir_snprintf(service_name, _countof(service_name), "%s%s", m_szModuleName, "/ManageAccount");

 	CreateProtoService("/ManageAccount", &CAimProto::ManageAccount);

diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp
index 7b7392e49d..1d371c61c7 100644
--- a/protocols/FacebookRM/src/theme.cpp
+++ b/protocols/FacebookRM/src/theme.cpp
@@ -220,7 +220,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 		CLISTMENUITEM miRoot = { 0 };

 		miRoot.popupPosition = 500085000;

 		miRoot.hParentMenu = HGENMENU_ROOT;

-		miRoot.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED);

+		miRoot.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (this->isOnline() ? 0 : CMIF_GRAYED);

 		miRoot.icolibItem = GetIconHandle("facebook");

 		miRoot.ptszName = m_tszUserName;

 		hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&miRoot);

@@ -231,7 +231,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 		m_hMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED);

+	mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED);

 	mi.position = 201001;

 	mi.hParentMenu = hRoot;

 

@@ -243,7 +243,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 

 	//CreateProtoService("/VisitProfile",&FacebookProto::VisitProfile);

 	mir_strcpy(tDest, "/VisitProfile");

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("Visit profile");

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	// TODO RM: remember and properly free in destructor?

@@ -258,7 +258,7 @@ int FacebookProto::OnBuildStatusMenu(WPARAM, LPARAM)
 	// Services...

 	mi.pszName = LPGEN("Services...");

 	mir_strcpy(tDest, "/Services");

-	mi.flags = CMIF_CHILDPOPUP | (this->isOnline() ? 0 : CMIF_GRAYED);

+	mi.flags = CMIF_ROOTHANDLE | (this->isOnline() ? 0 : CMIF_GRAYED);

 	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

 	m_hMenuServicesRoot = Menu_AddProtoMenuItem(&mi);

 

diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp
index db59455c4f..d6de671201 100644
--- a/protocols/GTalkExt/src/menu.cpp
+++ b/protocols/GTalkExt/src/menu.cpp
@@ -45,7 +45,7 @@ int InitMenus(WPARAM wParam, LPARAM lParam)
 		CreateServiceFunctionParam(szServiceName, OpenMailboxMenuHandler, (LPARAM)szModuleName);

 

 		CLISTMENUITEM cmi = { 0 };

-		cmi.flags = CMIF_CHILDPOPUP;

+		cmi.flags = CMIF_ROOTHANDLE;

 		cmi.hParentMenu = HGENMENU(wParam);

 		cmi.hIcon = g_hPopupIcon;

 		cmi.position = 200101;

diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp
index 1cfffa77ee..0712ed4784 100644
--- a/protocols/Gadu-Gadu/src/gg.cpp
+++ b/protocols/Gadu-Gadu/src/gg.cpp
@@ -270,7 +270,7 @@ void GGPROTO::menus_init()
       mi.ptszName = m_tszUserName;

       mi.position = 500090000;

       mi.hParentMenu = HGENMENU_ROOT;

-      mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+      mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

       mi.icolibItem = iconList[0].hIcolib;

       hGCRoot = hCLRoot = hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);

    }

diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 37e3d70cc0..c8a167d0d6 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -35,7 +35,7 @@ void CIrcProto::InitMainMenus(void)
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901010;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = GetIconHandle(IDI_MAIN);

 		hRoot = hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

@@ -45,7 +45,7 @@ void CIrcProto::InitMainMenus(void)
 		hMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.pszName = LPGEN("&Quick connect");

 	mi.icolibItem = GetIconHandle(IDI_QUICK);

 	mir_strcpy(d, IRC_QUICKCONNECT);

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 58e54e1297..42d1c744d5 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -422,7 +422,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 	char* tDest = text + nModuleNameLength;

 

 	CLISTMENUITEM mi = { 0 };

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.position = 0;

 	mi.icolibItem = NULL;

 	mi.pszService = text;

@@ -598,7 +598,7 @@ void CJabberProto::MenuInit()
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = m_hProtoIcon;

 		hJabberRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

@@ -611,7 +611,7 @@ void CJabberProto::MenuInit()
 	// "Bookmarks..."

 	CreateProtoService("/Bookmarks", &CJabberProto::OnMenuHandleBookmarks);

 	mir_strcpy(tDest, "/Bookmarks");

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = hJabberRoot;

 	mi.pszName = LPGEN("Bookmarks");

 	mi.position = 200001;

@@ -708,7 +708,7 @@ void CJabberProto::MenuInit()
 	mi.pszContactOwner = m_szModuleName;

 	mi.hParentMenu = hJabberRoot;

 	mi.pszName = LPGEN("Resource priority");

-	mi.flags = CMIF_ROOTPOPUP | CMIF_HIDDEN;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_HIDDEN;

 	m_hMenuPriorityRoot = Menu_AddProtoMenuItem(&mi);

 

 	TCHAR szName[128];

@@ -716,7 +716,7 @@ void CJabberProto::MenuInit()
 	mi.pszService = srvFce;

 	mi.ptszName = szName;

 	mi.position = 2000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 	mi.hParentMenu = m_hMenuPriorityRoot;

 

 	mir_snprintf(srvFce, _countof(srvFce), "%s/menuSetPriority/0", m_szModuleName);

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 1e3382f92d..569797413b 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -2094,7 +2094,7 @@ void CJabberProto::BuildPrivacyMenu()
 	mi.position = 200005;

 	mi.pszContactOwner = m_szModuleName;

 	mi.icolibItem = GetIconHandle(IDI_AGENTS);

-	mi.flags = CMIF_ROOTPOPUP | CMIF_CHILDPOPUP | CMIF_HIDDEN;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_ROOTHANDLE | CMIF_HIDDEN;

 	mi.pszName = LPGEN("Privacy Lists");

 	mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);

 	m_hPrivacyMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -2104,7 +2104,7 @@ void CJabberProto::BuildPrivacyMenu()
 	mir_snprintf(srvFce, _countof(srvFce), "%s/PrivacyLists", m_szModuleName);

 	mi.pszService = srvFce;

 	mi.position = 3000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = GetIconHandle(IDI_PRIVACY_LISTS);

 	mi.ptszName = LPGENT("List Editor...");

 	mi.hParentMenu = m_hPrivacyMenuRoot;

@@ -2125,7 +2125,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld)
 

 	CLISTMENUITEM mi = { 0 };

 	mi.position = 2000040000;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.hParentMenu = m_hPrivacyMenuRoot;

 	mi.pszService = srvFce;

 

diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index 740ab95550..fa103f86b7 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -339,7 +339,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI
 		if (hRootMenu == NULL) {

 			mi.ptszName = m_tszUserName;

 			mi.hParentMenu = HGENMENU_ROOT;

-			mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+			mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 			mi.hIcon = g_hMainIcon;

 			hRootMenu = Menu_AddProtoMenuItem(&mi);

 		}

@@ -351,14 +351,14 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI
 	else {

 		fnAddFunc = Menu_AddContactMenuItem;

 		mi.position = lPosition;

-		mi.flags = CMIF_ROOTPOPUP;

+		mi.flags = CMIF_ROOTHANDLE;

 	}

 

 	mi.pszName = LPGEN("Services...");

 	mi.hIcon = g_hMainIcon;

 	hRootMenu = fnAddFunc(&mi);

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = hRootMenu;

 	mi.popupPosition = lPopupPosition;

 	mi.pszService = szServiceFunction;

diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp
index 67f742da1c..52c56bebb0 100644
--- a/protocols/MSN/src/msn_menu.cpp
+++ b/protocols/MSN/src/msn_menu.cpp
@@ -278,7 +278,7 @@ void CMsnProto::MsnInitMainMenu(void)
 	if (hRoot == NULL) {

 		mi.popupPosition = 500085000;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = GetIconHandle(IDI_MSN);

 		mi.ptszName = m_tszUserName;

 		hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -288,7 +288,7 @@ void CMsnProto::MsnInitMainMenu(void)
 		mainMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = hRoot;

 	mi.pszService = servicefunction;

 

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 82b805699e..2f620ff0ff 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -121,7 +121,7 @@ int CSkypeProto::OnInitStatusMenu()
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = Skin_GetIconHandle("main");

 		hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi);

 	}

@@ -133,7 +133,7 @@ int CSkypeProto::OnInitStatusMenu()
 	m_hMenuRoot = NULL;

 	}*/

 	mi.hParentMenu = hStatusMunuRoot;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 

 

 	mir_strcpy(tDest, "/CreateNewChat");

diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp
index eeaec5377a..d997b29fc2 100644
--- a/protocols/Steam/src/steam_menus.cpp
+++ b/protocols/Steam/src/steam_menus.cpp
@@ -109,7 +109,7 @@ void CSteamProto::OnInitStatusMenu()
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		//mi.icolibItem = NULL;

 		hSteamRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);

 	}

@@ -121,7 +121,7 @@ void CSteamProto::OnInitStatusMenu()
 	}

 

 	mi.hParentMenu = hSteamRoot;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 

 	// Show block list

 	mir_strcpy(tDest, "/BlockList");

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 744a33c2f5..a6a38e0298 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -273,11 +273,11 @@ void TlenProtocol::initMenuItems()
 	mi.ptszName = m_tszUserName;

 	mi.position = -1999901009;

 	mi.hParentMenu = HGENMENU_ROOT;

-	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 	mi.icolibItem = GetIconHandle(IDI_TLEN);

 	hMenuRoot = Menu_AddMainMenuItem(&mi);

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = (HGENMENU)hMenuRoot;

 

 	hMenuChats = NULL;

diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index 6753214e3b..7657f80bea 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -89,7 +89,7 @@ int CToxProto::OnInitStatusMenu()
 		mi.ptszName = m_tszUserName;

 		mi.position = -1999901006;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = Skin_GetIconHandle("main");

 		hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi);

 	}

@@ -101,7 +101,7 @@ int CToxProto::OnInitStatusMenu()
 	}*/

 

 	mi.hParentMenu = hStatusMunuRoot;

-	mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;

+	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR;

 

 	// Create copy tox id command

 	mir_strcpy(tDest, "/CopyToxID");

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 8652c96d2c..23ab2d7fd4 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -195,7 +195,7 @@ void CVkProto::InitMenus()
 	char szService[100];

 

 	// Proto menu

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = Menu_GetProtocolRoot(m_szModuleName);

 	

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_CREATECHAT);

@@ -305,7 +305,7 @@ void CVkProto::InitMenus()
 	mi.pszService = szService;

 	g_hContactMenuItems[CMI_GETSERVERHISTORY] = Menu_AddContactMenuItem(&mi);

 		

-	mi.flags |= CMIF_CHILDPOPUP;

+	mi.flags |= CMIF_ROOTHANDLE;

 	mi.hParentMenu = g_hContactMenuItems[CMI_GETSERVERHISTORY];

 

 	mir_snprintf(szService, "%s%s", m_szModuleName, PS_GETSERVERHISTORYLAST1DAY);

diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp
index 6851cc571f..5210749b76 100644
--- a/protocols/WhatsApp/src/theme.cpp
+++ b/protocols/WhatsApp/src/theme.cpp
@@ -58,7 +58,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam)
 	if (hRoot == NULL) {

 		mi.popupPosition = 500085000;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED);

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED | (isOnline() ? 0 : CMIF_GRAYED);

 		mi.icolibItem = GetIconHandle("whatsApp");

 		mi.ptszName = m_tszUserName;

 		hRoot = m_hMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -69,7 +69,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam)
 		m_hMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_CHILDPOPUP | (isOnline() ? 0 : CMIF_GRAYED);

+	mi.flags = CMIF_ROOTHANDLE | (isOnline() ? 0 : CMIF_GRAYED);

 	mi.position = 201001;

 

 	CreateProtoService("/CreateGroup", &WhatsAppProto::OnCreateGroup);

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index d935f50d16..658824f400 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -376,7 +376,7 @@ void CYahooProto::MenuMainInit(void)
 	if (hRoot == NULL) {

 		mi.position = 500015000;

 		mi.hParentMenu = HGENMENU_ROOT;

-		mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

+		mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;

 		mi.icolibItem = GetIconHandle(IDI_YAHOO);

 		mi.ptszName = m_tszUserName;

 		hRoot = mainMenuRoot = Menu_AddProtoMenuItem(&mi);

@@ -387,7 +387,7 @@ void CYahooProto::MenuMainInit(void)
 		mainMenuRoot = NULL;

 	}

 

-	mi.flags = CMIF_CHILDPOPUP;

+	mi.flags = CMIF_ROOTHANDLE;

 	mi.hParentMenu = hRoot;

 

 	// Show custom status menu

diff --git a/src/mir_app/src/meta_menu.cpp b/src/mir_app/src/meta_menu.cpp
index c53083d2e6..2c04f2d3d4 100644
--- a/src/mir_app/src/meta_menu.cpp
+++ b/src/mir_app/src/meta_menu.cpp
@@ -397,12 +397,12 @@ void InitMenus()
 	hMenuDelete = Menu_AddContactMenuItem(&mi);

 

 	mi.position = -99000;

-	mi.flags = CMIF_HIDDEN | CMIF_ROOTPOPUP;

+	mi.flags = CMIF_HIDDEN | CMIF_ROOTHANDLE;

 	mi.icolibItem = 0;

 	mi.pszName = LPGEN("Subcontacts");

 	hMenuRoot = Menu_AddContactMenuItem(&mi);

 

-	mi.flags = CMIF_HIDDEN | CMIF_CHILDPOPUP;

+	mi.flags = CMIF_HIDDEN | CMIF_ROOTHANDLE;

 	mi.hParentMenu = hMenuRoot;

 	for (int i = 0; i < MAX_CONTACTS; i++) {

 		mi.position--;

diff --git a/src/mir_app/src/movetogroup.cpp b/src/mir_app/src/movetogroup.cpp
index a8bd2771e4..75b9a66dff 100644
--- a/src/mir_app/src/movetogroup.cpp
+++ b/src/mir_app/src/movetogroup.cpp
@@ -69,7 +69,7 @@ static void AddGroupItem(HGENMENU hRoot, TCHAR* name, int pos, WPARAM param, boo
 {

 	CLISTMENUITEM mi = { 0 };

 	mi.hParentMenu = hRoot;

-	mi.popupPosition = param; // param to pszService - only with CMIF_CHILDPOPUP !!!!!!

+	mi.popupPosition = param; // param to pszService - only with CMIF_ROOTHANDLE !!!!!!

 	mi.position = pos;

 	mi.ptszName = PrepareGroupName(name);

 	mi.flags = CMIF_ROOTHANDLE | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;