- unified menu creation using wrapper class CMenuItem;

- duplicated hLangpack field removed from TMO_IntMenuItem;
- code cleaning

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

5 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 00c1caa893..23f7be034e 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -767,7 +767,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	int framepos = id2pos(frameid);

 	FrameMenuHandles &fmh = (frameid == -1) ? cont : g_pfwFrames[framepos].MenuHandles;

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.root = root;

 	mi.position = popuppos++;

 	mi.name.a = LPGEN("&Visible");

@@ -1487,7 +1487,7 @@ static int CLUIFramesLoadMainMenu()
 	}

 

 	// create root menu

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME);

 	mi.position = 3000090000;

 	mi.name.a = LPGEN("Frames");

diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index 163d920fcd..48554635ce 100644
--- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -222,7 +222,7 @@ void InitGroupMenus(void)
 	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSGroup/GroupMenuonAddService");

 

 	// add exit command to menu

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.position = 1900000;

 	mi.pszService = "CloseAction";

 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_EXIT);

@@ -460,7 +460,7 @@ void InitSubGroupMenus(void)
 	// add exit command to menu

 	GroupMenuParam gmp;

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.position = 1000;

 	mi.hIcolibItem = iconItem[0].hIcolib;

 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 90850f414b..068a34b237 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -99,7 +99,7 @@ static int FAV_OnContactMenuBuild(WPARAM hContact, LPARAM)
 

 	BOOL bModifyMenu = FALSE;

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.hIcolibItem = iconList[bContactRate].hIcolib;

 	mi.flags = CMIF_TCHAR;

 	if (!bContactRate)

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index f66e4c2456..7e2fcf48e5 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -309,7 +309,7 @@ void InitTrayMenus(void)
 	Menu_ConfigureObject(hTrayMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSTRAY/TrayMenuonAddService");

 

 	// add exit command to menu

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.position = 900000;

 	mi.pszService = "CloseAction";

 	mi.name.a = LPGEN("E&xit");

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 0c02b4fb12..d3711780ac 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -335,7 +335,7 @@ HRESULT CLUI::RegisterAvatarMenu()
 {

 	Icon_RegisterT(g_hInst, LPGENT("Contact list"), iconItem, _countof(iconItem));

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	CreateServiceFunction("CList/ShowContactAvatar", CLUI::Service_Menu_ShowContactAvatar);

 	mi.position = 2000150000;

 	mi.hIcolibItem = iconItem[0].hIcolib;