- 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

3 files changed, 5 insertions, 5 deletions

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index d8b1a8c031..7d8c2a83dc 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -582,7 +582,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, boo
 	int framepos = id2pos(frameid);
 	FrameMenuHandles &fmh = (frameid == -1) ? cont : Frames[framepos].MenuHandles;
 
-	TMO_MenuItem mi = { 0 };
+	CMenuItem mi;
 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);
 	mi.root = root;
 	mi.position = popuppos++;
@@ -1338,7 +1338,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_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index 137fe1b888..7f7a15e2a7 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -227,7 +227,7 @@ void InitGroupMenus(void)
 	// add exit command to menu

 	GroupMenuParam gmp;

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.position = 1900000;

 	mi.pszService = "CloseAction";

 	mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_EXIT);

@@ -451,7 +451,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_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index 458f460bc0..19b39e3c06 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -381,7 +381,7 @@ int InitCustomMenus(void)
 	CreateServiceFunction("CloseAction", CloseAction);

 	CreateServiceFunction("CList/SetContactIgnore", SetContactIgnore);

 

-	TMO_MenuItem mi = { 0 };

+	CMenuItem mi;

 	mi.position = 200000;

 	mi.pszService = "CList/SetContactIgnore";

 	mi.hIcolibItem = iconItem[1].hIcolib;