From f56d89298e23be23b16efd33fc375eb4a9971c12 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 22 May 2018 19:33:58 +0300 Subject: m_extraicons.h => CMPlugin --- include/m_extraicons.h | 4 ++-- libs/win32/mir_app.lib | Bin 167958 -> 167958 bytes src/mir_app/src/ei_services.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/m_extraicons.h b/include/m_extraicons.h index e394306d5b..3bb9da0000 100644 --- a/include/m_extraicons.h +++ b/include/m_extraicons.h @@ -110,10 +110,10 @@ EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(int langId); #define EIF_DISABLED_BY_DEFAULT 0x0001 EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, const char *descIcon, - MIRANDAHOOK RebuildIcons, MIRANDAHOOK ApplyIcon, MIRANDAHOOKPARAM OnClick = nullptr, LPARAM onClickParam = 0, int flags = 0, int = hLangpack); + MIRANDAHOOK RebuildIcons, MIRANDAHOOK ApplyIcon, MIRANDAHOOKPARAM OnClick = nullptr, LPARAM onClickParam = 0, int flags = 0); EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterIcolib(const char *name, const char *description, const char *descIcon = nullptr, - MIRANDAHOOKPARAM OnClick = nullptr, LPARAM onClickParam = 0, int flags = 0, int = hLangpack); + MIRANDAHOOKPARAM OnClick = nullptr, LPARAM onClickParam = 0, int flags = 0); ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index eb58b07d19..8da0c0e975 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp index 11aa883910..fff8bbb1c4 100644 --- a/src/mir_app/src/ei_services.cpp +++ b/src/mir_app/src/ei_services.cpp @@ -373,7 +373,7 @@ static void EI_PostCreate(BaseExtraIcon *extra, const char *name, int flags) EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, const char *descIcon, MIRANDAHOOK RebuildIcons, MIRANDAHOOK ApplyIcon, - MIRANDAHOOKPARAM OnClick, LPARAM onClickParam, int flags, int _hLang) + MIRANDAHOOKPARAM OnClick, LPARAM onClickParam, int flags) { // EXTRAICON_TYPE_CALLBACK if (IsEmpty(name) || IsEmpty(description)) @@ -390,13 +390,13 @@ EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const int id = registeredExtraIcons.getCount() + 1; BaseExtraIcon *extra = new CallbackExtraIcon(id, name, tszDesc, descIcon == nullptr ? "" : descIcon, RebuildIcons, ApplyIcon, OnClick, onClickParam); - extra->m_hLangpack = _hLang; + extra->m_hLangpack = GetPluginLangByInstance(GetInstByAddress(RebuildIcons)); EI_PostCreate(extra, name, flags); return (HANDLE)id; } EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterIcolib(const char *name, const char *description, const char *descIcon, - MIRANDAHOOKPARAM OnClick, LPARAM onClickParam, int flags, int _hLang) + MIRANDAHOOKPARAM OnClick, LPARAM onClickParam, int flags) { if (IsEmpty(name) || IsEmpty(description)) return nullptr; @@ -427,7 +427,7 @@ EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterIcolib(const char *name, const ch int id = registeredExtraIcons.getCount() + 1; extra = new IcolibExtraIcon(id, name, tszDesc, descIcon == nullptr ? "" : descIcon, OnClick, onClickParam); - extra->m_hLangpack = _hLang; + extra->m_hLangpack = GetPluginLangByInstance(GetInstByAddress((void*)name)); EI_PostCreate(extra, name, flags); return (HANDLE)id; } -- cgit v1.2.3