m_genmenu.h unbound from hLangpack

4 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 3006c0441e..8d631fc505 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -69,7 +69,7 @@ static HFONT     _hTitleBarFont = nullptr;
 

 // menus

 static FrameMenuHandles cont = {};

-static LIST<HGENMENU__> g_frameMenus(10);

+static LIST<TMO_IntMenuItem> g_frameMenus(10);

 

 // others

 static int _nContactListHeight = 0;

@@ -749,7 +749,7 @@ static HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popupp
 	int framepos = id2pos(frameid);

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

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.root = root;

 	mi.position = popuppos++;

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

@@ -1470,7 +1470,7 @@ static int CLUIFramesLoadMainMenu()
 	g_frameMenus.destroy();

 

 	// create frames menu

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	mi.root = cont.MainMenuItem;

 	int separator = 3000200000;

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

@@ -3312,7 +3312,7 @@ int LoadCLUIFramesModule(void)
 	InitGroupMenus();

 	{

 		// create root menu

-		CMenuItem mi;

+		CMenuItem mi(g_plugin);

 		SET_UID(mi, 0x3931AC4, 0x7A32, 0x4D9C, 0x99, 0x92, 0x94, 0xD4, 0xB5, 0x9B, 0xD6, 0xB6);

 		mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME);

 		mi.position = 3000090000;

diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp
index 0c2f81b74a..431bc8ace8 100644
--- a/plugins/Clist_modern/src/groupmenu.cpp
+++ b/plugins/Clist_modern/src/groupmenu.cpp
@@ -56,7 +56,7 @@ void InitGroupMenus(void)
 

 	InitSubGroupMenus();

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 

 	SET_UID(mi, 0xe386678a, 0x5aee, 0x4bfa, 0xa8, 0x23, 0xd, 0xa0, 0x11, 0x99, 0xb1, 0x98);

 	mi.position = 500;

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

 	GroupMenuParam gmp = { POPUP_GROUPSHOWOFFLINE, 0 };

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	SET_UID(mi, 0x7E081A28, 0x19B3, 0x407F, 0x80, 0x6B, 0x70, 0xC3, 0xC3, 0xA9, 0xD2, 0xA4);

 	mi.position = 1002;

 	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 0ba0175fe0..6690aadc85 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -93,7 +93,7 @@ INT_PTR FAV_ToggleShowOffline(WPARAM hContact, LPARAM)
 

 void LoadFavoriteContactMenu()

 {

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	SET_UID(mi, 0xf99a2320, 0xc024, 0x48bd, 0x81, 0xf7, 0x9f, 0xa2, 0x5, 0xb0, 0x7f, 0xdc);

 	mi.name.w = FAVMENUROOTNAME;

 	mi.flags = CMIF_UNICODE;

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index a64770f200..c498208b64 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -325,7 +325,7 @@ HRESULT CLUI::RegisterAvatarMenu()
 {

 	g_plugin.registerIcon(LPGEN("Contact list"), iconItem);

 

-	CMenuItem mi;

+	CMenuItem mi(g_plugin);

 	SET_UID(mi, 0x1cc99858, 0x40ca, 0x4558, 0xae, 0x10, 0xba, 0x81, 0xaf, 0x4c, 0x67, 0xb5);

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

 	mi.position = 2000150000;