diff options
author | George Hazan <ghazan@miranda.im> | 2019-04-13 20:22:59 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-04-13 20:22:59 +0300 |
commit | 680873487c4a7987012606119a744e5ca725ad30 (patch) | |
tree | 8e5fbc68a253c3ec44287754c9295670f1ee44c3 /plugins/Popup/src/icons.cpp | |
parent | 6c4136504c660bf3359e6641362672c4b9502be5 (diff) |
merge with trunk
Diffstat (limited to 'plugins/Popup/src/icons.cpp')
-rw-r--r-- | plugins/Popup/src/icons.cpp | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp index 083593ac11..7e0df28a29 100644 --- a/plugins/Popup/src/icons.cpp +++ b/plugins/Popup/src/icons.cpp @@ -66,41 +66,7 @@ static IconItem iconList3[] = void InitIcons()
{
- g_plugin.registerIcon(SECT_POPUP, iconList1, MODULENAME);
- g_plugin.registerIcon(SECT_POPUP SECT_POPUP_OPT, iconList2, MODULENAME);
- g_plugin.registerIcon(SECT_POPUP SECT_POPUP_ACT, iconList3, MODULENAME);
-}
-
-HICON LoadIconEx(int iconId, bool big)
-{
- for (auto &it : iconList1)
- if (it.defIconID == iconId)
- return IcoLib_GetIconByHandle(it.hIcolib, big);
-
- for (auto &it : iconList2)
- if (it.defIconID == iconId)
- return IcoLib_GetIconByHandle(it.hIcolib, big);
-
- for (auto &it : iconList3)
- if (it.defIconID == iconId)
- return IcoLib_GetIconByHandle(it.hIcolib, big);
-
- return nullptr;
-}
-
-HANDLE GetIconHandle(int iconId)
-{
- for (auto &it : iconList1)
- if (it.defIconID == iconId)
- return it.hIcolib;
-
- for (auto &it : iconList2)
- if (it.defIconID == iconId)
- return it.hIcolib;
-
- for (auto &it : iconList3)
- if (it.defIconID == iconId)
- return it.hIcolib;
-
- return nullptr;
+ g_plugin.registerIcon(MODULNAME_PLU, iconList1, MODULENAME);
+ g_plugin.registerIcon(MODULNAME_PLU "/Options", iconList2, MODULENAME);
+ g_plugin.registerIcon(MODULNAME_PLU "/Actions", iconList3, MODULENAME);
}
|