From f719c8b921c7a46b76453476204224d40c682914 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 11 Jul 2018 21:32:58 +0300 Subject: int hLangpack/m_hLang removed and replaced with HPLUGIN --- plugins/PasteIt/src/Options.cpp | 3 +-- plugins/PasteIt/src/PasteIt.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/PasteIt/src') diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 1077714690..fe6a819888 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -677,9 +677,8 @@ void Options::SetCodepageCB(HWND hwndCB, unsigned int codepage) int Options::InitOptions(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { 0 }; + OPTIONSDIALOGPAGE odp = {}; odp.position = 100000000; - odp.hInstance = g_plugin.getInst(); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.szTitle.w = LPGENW("Paste It"); odp.szGroup.w = LPGENW("Services"); diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 4e48b1aabf..0b538f5cae 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -251,7 +251,7 @@ static INT_PTR ContactMenuService(WPARAM hContact, LPARAM lParam) static void InitMenuItems() { - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); SET_UID(mi, 0x33ecc112, 0x6, 0x487d, 0xbb, 0x8b, 0x76, 0xb4, 0x17, 0x9b, 0xdb, 0xc5); mi.flags = CMIF_UNICODE; @@ -277,7 +277,7 @@ static void InitMenuItems() HGENMENU hDefWebMenu = Menu_AddContactMenuItem(&mi); Menu_ConfigureItem(hDefWebMenu, MCI_OPT_EXECPARAM, DEF_PAGES_START - 1); - CMenuItem mi2(g_plugin); + CMenuItem mi2(&g_plugin); mi2.pszService = MS_PASTEIT_CONTACTMENU; mi2.root = hDefWebMenu; for (int i = 0; i < PasteToWeb::pages; ++i) { @@ -309,7 +309,7 @@ static void InitTabsrmmButton() btn.hIcon = iconList[0].hIcolib; btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_CANBEHIDDEN | BBBF_ISCHATBUTTON; btn.pwszTooltip = TranslateT("Paste It"); - Srmm_AddButton(&btn, g_plugin.m_hLang); + Srmm_AddButton(&btn, &g_plugin); if (hTabsrmmButtonPressed != nullptr) UnhookEvent(hTabsrmmButtonPressed); -- cgit v1.2.3