summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-18 21:56:03 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-05-18 21:56:03 +0300
commitcb4d31922f0690f5a3c79526245c963bfd118864 (patch)
treea6826371092617844c19772e73bf4e5756400140 /src/core
parent37a022d37e79dbe9892f376ef7c3b6b8878c4aff (diff)
Icon_Register(g_plugin.getInst() => g_plugin.registerIcon
Icon_RegisterT(g_plugin.getInst() => g_plugin.registerIconW
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdmsg/src/chat_options.cpp11
-rw-r--r--src/core/stdmsg/src/globals.cpp2
2 files changed, 8 insertions, 5 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index 778d8f1af8..a5f0428519 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -135,7 +135,7 @@ static INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM p
// add icons to the skinning module
-static IconItem iconList[] =
+static IconItem iconList1[] =
{
{ LPGEN("Window icon"), "chat_window", IDI_CHANMGR, 0 },
{ LPGEN("Text color"), "chat_fgcol", IDI_COLOR, 0 },
@@ -158,8 +158,11 @@ static IconItem iconList[] =
{ LPGEN("Status 3 (10x10)"), "chat_status2", IDI_STATUS2, 10 },
{ LPGEN("Status 4 (10x10)"), "chat_status3", IDI_STATUS3, 10 },
{ LPGEN("Status 5 (10x10)"), "chat_status4", IDI_STATUS4, 10 },
- { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10 },
+ { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10 }
+};
+static IconItem iconList2[] =
+{
{ LPGEN("Message in (10x10)"), "chat_log_message_in", IDI_MESSAGE, 10 },
{ LPGEN("Message out (10x10)"), "chat_log_message_out", IDI_MESSAGEOUT, 10 },
{ LPGEN("Action (10x10)"), "chat_log_action", IDI_ACTION, 10 },
@@ -178,8 +181,8 @@ static IconItem iconList[] =
void AddIcons(void)
{
- Icon_Register(g_plugin.getInst(), LPGEN("Messaging") "/" LPGEN("Group chats"), iconList, 21);
- Icon_Register(g_plugin.getInst(), LPGEN("Messaging") "/" LPGEN("Group chats log"), iconList + 21, 14);
+ g_plugin.registerIcon(LPGEN("Messaging") "/" LPGEN("Group chats"), iconList1);
+ g_plugin.registerIcon(LPGEN("Messaging") "/" LPGEN("Group chats log"), iconList2);
}
// load icons from the skinning module if available
diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index dd0ab36221..08a91a5d3b 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -30,7 +30,7 @@ IconItem iconList[] =
static void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), LPGEN("Messaging"), iconList, _countof(iconList), "SRMM");
+ g_plugin.registerIcon(LPGEN("Messaging"), iconList, "SRMM");
}
static int IconsChanged(WPARAM, LPARAM)