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/BasicHistory/src/BasicHistory.cpp | 6 +++--- plugins/BasicHistory/src/Options.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/BasicHistory') diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 5bac74c444..a371fcdfa0 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -89,7 +89,7 @@ int ToolbarModuleLoaded(WPARAM, LPARAM) void InitMenuItems() { - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); SET_UID(mi, 0x28848d7a, 0x6995, 0x4799, 0x82, 0xd7, 0x18, 0x40, 0x3d, 0xe3, 0x71, 0xc4); mi.position = 1000090000; @@ -116,7 +116,7 @@ void InitTaskMenuItems() { if (Options::instance->taskOptions.size() > 0) { if (hTaskMainMenu == nullptr) { - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); SET_UID(mi, 0xbf66499, 0x1b39, 0x47a2, 0x9b, 0x74, 0xa6, 0xae, 0x89, 0x95, 0x59, 0x59); mi.position = 500060005; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY); @@ -134,7 +134,7 @@ void InitTaskMenuItems() int pos = (int)taskMenus.size(); for (; taskIt != Options::instance->taskOptions.end(); ++taskIt) { - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); mi.flags = CMIF_UNICODE | CMIF_KEEPUNTRANSLATED; mi.pszService = MS_HISTORY_EXECUTE_TASK; mi.root = hTaskMainMenu; diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 907d13bd35..7981210cc9 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -117,9 +117,8 @@ Options::~Options() 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("History"); -- cgit v1.2.3