summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-04-12 18:06:38 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-04-12 18:06:38 +0300
commit4912fd0d994ac7b68b41bd8f3d08dcab89298023 (patch)
tree7374b4d6f85e1f3c154d6799d2176d6910add259 /include
parent3a9e5e8049dda17a8e5c7b70bfed411760f424be (diff)
- extra icons default changed from icon's name to icon's handle;
- Skin_GetIconName() considered obsolete and therefore removed;
Diffstat (limited to 'include')
-rw-r--r--include/delphi/m_skin.inc3
-rw-r--r--include/m_extraicons.h4
-rw-r--r--include/m_skin.h1
3 files changed, 2 insertions, 6 deletions
diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc
index b1cf7e3acc..27c3d8a86e 100644
--- a/include/delphi/m_skin.inc
+++ b/include/delphi/m_skin.inc
@@ -95,9 +95,6 @@ function Skin_LoadIcon(iconId:int; big:byte) : HICON; stdcall;
function Skin_GetIconHandle(iconId:int) : THANDLE; stdcall;
external AppDLL name 'Skin_GetIconHandle';
-function Skin_GetIconName(iconId:int) : PAnsiChar; stdcall;
- external AppDLL name 'Skin_GetIconName';
-
// status mode icons. NOTE: These are deprecated in favour of LoadSkinnedProtoIcon()
const
SKINICON_STATUS_OFFLINE = 0;
diff --git a/include/m_extraicons.h b/include/m_extraicons.h
index 30f306b1f4..d5a4c39ee9 100644
--- a/include/m_extraicons.h
+++ b/include/m_extraicons.h
@@ -109,10 +109,10 @@ EXTERN_C MIR_APP_DLL(void) KillModuleExtraIcons(HPLUGIN pPlugin);
#define EIF_DISABLED_BY_DEFAULT 0x0001
-EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, const char *descIcon,
+EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterCallback(const char *name, const char *description, HANDLE descIcon,
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,
+EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_RegisterIcolib(const char *name, const char *description, HANDLE descIcon = nullptr,
MIRANDAHOOKPARAM OnClick = nullptr, LPARAM onClickParam = 0, int flags = 0);
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/m_skin.h b/include/m_skin.h
index 33f110e017..5d0e7f05bb 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -96,7 +96,6 @@
EXTERN_C MIR_APP_DLL(HICON) Skin_LoadIcon(int idx, bool big = false);
EXTERN_C MIR_APP_DLL(HANDLE) Skin_GetIconHandle(int idx);
-EXTERN_C MIR_APP_DLL(char*) Skin_GetIconName(int idx);
// status mode icons. NOTE: These are deprecated in favour of LoadSkinProtoIcon()
#define SKINICON_STATUS_OFFLINE 0