From 3f9882178018afbe9aaaba1f4461f3fc75493260 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 15 Jun 2015 14:23:02 +0000
Subject: MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct
function calls
git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
protocols/Tox/src/tox_icons.cpp | 2 +-
protocols/Tox/src/tox_menus.cpp | 8 ++++----
protocols/Tox/src/tox_options.cpp | 4 ++--
protocols/Tox/src/tox_proto.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'protocols/Tox')
diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp
index 7a56fce4c8..85f2b427bd 100644
--- a/protocols/Tox/src/tox_icons.cpp
+++ b/protocols/Tox/src/tox_icons.cpp
@@ -52,7 +52,7 @@ HANDLE CToxProto::GetIconHandle(const char *name)
return NULL;
}
-HANDLE CToxProto::GetSkinIconHandle(const char *name)
+HANDLE CToxProto::Skin_GetIconHandle(const char *name)
{
char iconName[100];
mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp
index 95b37d9dcb..914920eb9d 100644
--- a/protocols/Tox/src/tox_menus.cpp
+++ b/protocols/Tox/src/tox_menus.cpp
@@ -48,7 +48,7 @@ void CToxProto::InitMenus()
mi.pszService = MODULE"/RequestAuth";
mi.ptszName = LPGENT("Request authorization");
mi.position = CMI_POSITION + CMI_AUTH_REQUEST;
- mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_REQUEST);
+ mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_REQUEST);
ContactMenuItems[CMI_AUTH_REQUEST] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnRequestAuth>);
@@ -56,7 +56,7 @@ void CToxProto::InitMenus()
mi.pszService = MODULE"/GrantAuth";
mi.ptszName = LPGENT("Grant authorization");
mi.position = CMI_POSITION + CMI_AUTH_GRANT;
- mi.icolibItem = LoadSkinnedIconHandle(SKINICON_AUTH_GRANT);
+ mi.icolibItem = ::Skin_GetIconHandle(SKINICON_AUTH_GRANT);
ContactMenuItems[CMI_AUTH_GRANT] = Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, GlobalService<&CToxProto::OnGrantAuth>);
@@ -90,7 +90,7 @@ int CToxProto::OnInitStatusMenu()
mi.position = -1999901006;
mi.hParentMenu = HGENMENU_ROOT;
mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
- mi.icolibItem = GetSkinIconHandle("main");
+ mi.icolibItem = Skin_GetIconHandle("main");
hStatusMunuRoot = /*m_hMenuRoot = */Menu_AddProtoMenuItem(&mi);
}
/*else
@@ -116,7 +116,7 @@ int CToxProto::OnInitStatusMenu()
CreateProtoService(tDest, &CToxProto::OnCreateChatRoom);
mi.ptszName = LPGENT("Create group chat");
mi.position = SMI_POSITION + SMI_GROUPCHAT_CREATE;
- mi.icolibItem = GetSkinIconHandle("conference");
+ mi.icolibItem = Skin_GetIconHandle("conference");
HGENMENU hCreateChatRoom = Menu_AddProtoMenuItem(&mi);*/
return 0;
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 85af8ca960..d5cc88a42c 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -375,9 +375,9 @@ void CToxOptionsNodeList::OnInitDialog()
m_nodes.SetExtendedListViewStyle(LVS_EX_SUBITEMIMAGES | LVS_EX_FULLROWSELECT | LVS_EX_LABELTIP);
HIMAGELIST hImageList = m_nodes.CreateImageList(LVSIL_SMALL);
- HICON icon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);
+ HICON icon = Skin_LoadIcon(SKINICON_OTHER_TYPING);
ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);
- icon = LoadSkinnedIcon(SKINICON_OTHER_DELETE);
+ icon = Skin_LoadIcon(SKINICON_OTHER_DELETE);
ImageList_AddIcon(hImageList, icon); IcoLib_ReleaseIcon(icon);
m_nodes.AddColumn(0, _T("IPv4"), 100);
diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index 2afaae8347..b0e9ef17a7 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -125,7 +125,7 @@ private:
static IconInfo Icons[];
static HICON GetIcon(const char *name, int size = 0);
static HANDLE GetIconHandle(const char *name);
- static HANDLE GetSkinIconHandle(const char *name);
+ static HANDLE Skin_GetIconHandle(const char *name);
// menus
static HGENMENU ContactMenuItems[CMI_MAX];
--
cgit v1.2.3