From f719c8b921c7a46b76453476204224d40c682914 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 11 Jul 2018 21:32:58 +0300
Subject: int hLangpack/m_hLang removed and replaced with HPLUGIN

---
 plugins/MenuItemEx/src/main.cpp    | 6 +++---
 plugins/MenuItemEx/src/options.cpp | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/MenuItemEx')

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 0ed62c9026..31dc559030 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -737,7 +737,7 @@ static INT_PTR onIgnore(WPARAM wparam, LPARAM lparam)
 
 static HGENMENU AddSubmenuItem(HGENMENU hRoot, wchar_t* name, HICON icon, DWORD flag, char* service, int pos, INT_PTR param)
 {
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.root = hRoot;
 	mi.position = pos;
 	mi.name.w = name;
@@ -905,7 +905,7 @@ static int TabsrmmButtonsInit(WPARAM, LPARAM)
 	bbd.pwszTooltip = LPGENW("Browse Received Files");
 	bbd.bbbFlags = BBBF_CANBEHIDDEN;
 	bbd.hIcon = IcoLib_GetIconHandle("miex_recfiles");
-	Srmm_AddButton(&bbd, g_plugin.m_hLang);
+	Srmm_AddButton(&bbd, &g_plugin);
 	return 0;
 }
 
@@ -943,7 +943,7 @@ static int PluginInit(WPARAM, LPARAM)
 
 	ModuleLoad(0, 0);
 
-	CMenuItem mi(g_plugin);
+	CMenuItem mi(&g_plugin);
 	mi.flags = CMIF_UNICODE;
 
 	SET_UID(mi, 0x2616aa3f, 0x535a, 0x464c, 0xbd, 0x26, 0x1b, 0x15, 0xbe, 0xfa, 0x1f, 0xf);
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index eeee4998c6..313ee51702 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -96,9 +96,8 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 
 int OptionsInit(WPARAM wparam, LPARAM)
 {
-	OPTIONSDIALOGPAGE odp = { 0 };
+	OPTIONSDIALOGPAGE odp = {};
 	odp.position = 955000000;
-	odp.hInstance = g_plugin.getInst();
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
 	odp.szTitle.a = MODULENAME;
 	odp.pfnDlgProc = OptionsProc;
-- 
cgit v1.2.3