CMPluginBase::addImgListIcon: new helper to safely add an icolib icon to HIMAGELIST

8 files changed, 27 insertions, 35 deletions

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index a2c69a335a..b3d8e0e791 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -195,8 +195,8 @@ public:
 		m_lvBookmarks.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES | LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER);

 

 		HIMAGELIST hIml = m_lvBookmarks.CreateImageList(LVSIL_SMALL);

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_GROUP));

-		ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_EVENT_URL));

+		g_plugin.addImgListIcon(hIml, IDI_GROUP);

+		ImageList_AddSkinIcon(hIml, SKINICON_EVENT_URL);

 

 		m_lvBookmarks.AddColumn(0, TranslateT("Bookmark Name"), m_proto->getWord("bookmarksWnd_cx0", 120));

 		m_lvBookmarks.AddColumn(1, TranslateT("Address (JID or URL)"), m_proto->getWord("bookmarksWnd_cx1", 210));

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index ed7ce4a046..603a891d23 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -508,9 +508,3 @@ void g_IconsInit()
 	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Discovery"), sharedIconList3, GLOBAL_SETTING_PREFIX);

 	g_plugin.registerIcon(LPGEN("Protocols") "/" LPGEN("Jabber") "/" LPGEN("Dialogs") "/" LPGEN("Privacy"), sharedIconList4, GLOBAL_SETTING_PREFIX);

 }

-

-void ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon)

-{

-	ImageList_AddIcon(hIml, hIcon);

-	IcoLib_ReleaseIcon(hIcon);

-}

diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index a7e93e78a9..3079cfa96a 100644
--- a/protocols/JabberG/src/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
@@ -180,8 +180,8 @@ public:
 	bool OnInitDialog() override

 	{

 		HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 2, 0);

-		ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_DELETE));

-		ImageList_AddIcon(hImageList, g_plugin.getIcon(IDI_ADDCONTACT));

+		g_plugin.addImgListIcon(hImageList, IDI_DELETE);

+		g_plugin.addImgListIcon(hImageList, IDI_ADDCONTACT);

 		m_list.SetImageList(hImageList, LVSIL_SMALL);

 

 		m_list.SetExtendedListViewStyle(LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES | LVS_EX_GRIDLINES);

diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index c8bda4c769..f8c5ed2379 100644
--- a/protocols/JabberG/src/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
@@ -97,13 +97,13 @@ void CCtrlTreeOpts::OnInit()
 	DeleteAllItems();

 

 	hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1);

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_MIRANDA));

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_TICK));	// check on

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// check off

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_TICK));	// radio on

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// radio on

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN));

-	ImageList_AddIcon_Icolib(hImgLst, Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT));

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_MIRANDA);

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_TICK);	// check on

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_NOTICK);	// check off

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_TICK);	// radio on

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_NOTICK);	// radio on

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_GROUPOPEN);

+	ImageList_AddSkinIcon(hImgLst, SKINICON_OTHER_GROUPSHUT);

 	SetImageList(hImgLst, TVSIL_NORMAL);

 

 	/* build options tree. based on code from IcoLib */

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 4c7f27714c..5aeb3690dd 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -1340,15 +1340,15 @@ public:
 		m_clcClist.SetExStyle(CLS_EX_DISABLEDRAGDROP | CLS_EX_TRACKSELECT);

 

 		HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 9, 9);

-		ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_SMALLDOT));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_MSG_ALLOW));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_MSG_DENY));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_PRIN_ALLOW));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_PRIN_DENY));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_PROUT_ALLOW));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_PROUT_DENY));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_QUERY_ALLOW));

-		ImageList_AddIcon_Icolib(hIml, g_plugin.getIcon(IDI_PL_QUERY_DENY));

+		ImageList_AddSkinIcon(hIml, SKINICON_OTHER_SMALLDOT);

+		g_plugin.addImgListIcon(hIml, IDI_PL_MSG_ALLOW);

+		g_plugin.addImgListIcon(hIml, IDI_PL_MSG_DENY);

+		g_plugin.addImgListIcon(hIml, IDI_PL_PRIN_ALLOW);

+		g_plugin.addImgListIcon(hIml, IDI_PL_PRIN_DENY);

+		g_plugin.addImgListIcon(hIml, IDI_PL_PROUT_ALLOW);

+		g_plugin.addImgListIcon(hIml, IDI_PL_PROUT_DENY);

+		g_plugin.addImgListIcon(hIml, IDI_PL_QUERY_ALLOW);

+		g_plugin.addImgListIcon(hIml, IDI_PL_QUERY_DENY);

 		m_clcClist.SetExtraImageList(hIml);

 		m_clcClist.SetExtraColumns(4);

 

diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp
index c228169c17..b8588ef601 100644
--- a/protocols/JabberG/src/jabber_treelist.cpp
+++ b/protocols/JabberG/src/jabber_treelist.cpp
@@ -138,9 +138,9 @@ void TreeList_Create(HWND hwnd)
 	ListView_SetImageList(hwnd, hIml, LVSIL_SMALL);

 

 	hIml = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 2, 1);

-	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN));

-	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT));

-	ImageList_AddIcon_Icolib(hIml, Skin_LoadIcon(SKINICON_OTHER_DOWNARROW));

+	ImageList_AddSkinIcon(hIml, SKINICON_OTHER_GROUPOPEN);

+	ImageList_AddSkinIcon(hIml, SKINICON_OTHER_GROUPSHUT);

+	ImageList_AddSkinIcon(hIml, SKINICON_OTHER_DOWNARROW);

 	ListView_SetImageList(hwnd, hIml, LVSIL_STATE);

 }

 

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index b8366ca25f..0488052609 100755
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -403,12 +403,12 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		memset(dat, 0, sizeof(JabberUserInfoDlgData));
 		dat->resourcesCount = -1;
 		dat->hContact = lParam;
-		{
-			GetClientRect(hwndDlg, &rc);
-			MoveWindow(GetDlgItem(hwndDlg, IDC_TV_INFO), 5, 5, rc.right - 10, rc.bottom - 10, TRUE);
 
+		GetClientRect(hwndDlg, &rc);
+		MoveWindow(GetDlgItem(hwndDlg, IDC_TV_INFO), 5, 5, rc.right - 10, rc.bottom - 10, TRUE);
+		{
 			HIMAGELIST himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, 1);
-			ImageList_AddIcon_Icolib(himl, Skin_LoadIcon(SKINICON_OTHER_SMALLDOT));
+			ImageList_AddSkinIcon(himl, SKINICON_OTHER_SMALLDOT);
 			TreeView_SetImageList(GetDlgItem(hwndDlg, IDC_TV_INFO), himl, TVSIL_NORMAL);
 
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index 99dbaae464..ecb24700bc 100755
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -673,8 +673,6 @@ void   g_IconsInit();
 void   g_XstatusIconsInit();

 void   g_XstatusIconsUninit();

 

-void   ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon);

-

 //---- jabber_libstr.c ----------------------------------------------

 

 int lstrcmp_null(const wchar_t *s1, const wchar_t *s2);