- all icolib services removed;

- IcoLib_* functions are bound directly to the code

git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 14 insertions, 14 deletions

diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp
index 406f3bb282..6b0de1787e 100644
--- a/plugins/PluginUpdater/src/DlgListNew.cpp
+++ b/plugins/PluginUpdater/src/DlgListNew.cpp
@@ -137,9 +137,9 @@ static int ListDlg_Resize(HWND, LPARAM, UTILRESIZECONTROL *urc)
 

 int ImageList_AddIconFromIconLib(HIMAGELIST hIml, int i)

 {

-	HICON icon = Skin_GetIconByHandle(iconList[i].hIcolib);

+	HICON icon = IcoLib_GetIconByHandle(iconList[i].hIcolib);

 	int res = ImageList_AddIcon(hIml, icon);

-	Skin_ReleaseIcon(icon);

+	IcoLib_ReleaseIcon(icon);

 	return res;

 }

 

@@ -152,8 +152,8 @@ INT_PTR CALLBACK DlgList(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 		TranslateDialogDefault( hDlg );

 		oldWndProc = (WNDPROC)SetWindowLongPtr(hwndList, GWLP_WNDPROC, (LONG_PTR)PluginListWndProc);

 		

-		SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(iconList[2].hIcolib, 1));

-		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(iconList[2].hIcolib));

+		SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(iconList[2].hIcolib, 1));

+		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(iconList[2].hIcolib));

 		{

 			HIMAGELIST hIml = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 4, 0);

 			ImageList_AddIconFromIconLib(hIml, 1);

@@ -324,8 +324,8 @@ INT_PTR CALLBACK DlgList(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 

 	case WM_DESTROY:

 		Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ListWindow");

-		Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_BIG, 0));

-		Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_BIG, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0));

 		hwndDialog = NULL;

 		delete (OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);

 		SetWindowLongPtr(hDlg, GWLP_USERDATA, 0);

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 3aa968bbce..87fe5e7498 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -161,11 +161,11 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 		TranslateDialogDefault(hDlg);

 		SendMessage(hwndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);

 #if MIRANDA_VER >= 0x0A00

-		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIconByHandle(iconList[0].hIcolib));

-		SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(iconList[0].hIcolib, 1));

+		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib));

+		SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(iconList[0].hIcolib, 1));

 #else

-		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon("check_update"));

-		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon("check_update",1));

+		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update"));

+		SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update",1));

 #endif

 		{

 			OSVERSIONINFO osver = { sizeof(osver) };

@@ -341,7 +341,7 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 		break;

 

 	case WM_DESTROY:

-		Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0));

+		IcoLib_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0));

 		Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ConfirmWindow");

 		hwndDialog = NULL;

 		delete (OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);

diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index b7ac68c75c..4cfec11d5f 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -102,9 +102,9 @@ void ShowPopup(LPCTSTR ptszTitle, LPCTSTR ptszText, int Number)
 			POPUPDATAT pd = { 0 };

 			pd.lchContact = NULL;

 #if MIRANDA_VER >= 0x0A00

-			pd.lchIcon = Skin_GetIconByHandle(iconList[0].hIcolib);

+			pd.lchIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib);

 #else

-			pd.lchIcon = Skin_GetIcon("check_update");

+			pd.lchIcon = IcoLib_GetIcon("check_update");

 #endif

 			if (Number == POPUP_TYPE_MSG) {

 				pd.PluginWindowProc = PopupDlgProcRestart;

diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp
index 86e476bd05..ca93a3442c 100644
--- a/plugins/PluginUpdater/src/PluginUpdater.cpp
+++ b/plugins/PluginUpdater/src/PluginUpdater.cpp
@@ -89,7 +89,7 @@ extern "C" __declspec(dllexport) int Load(void)
 #if MIRANDA_VER >= 0x0A00

 	mi.icolibItem = iconList[0].hIcolib;

 #else

-	mi.icolibItem = Skin_GetIconHandle("check_update");

+	mi.icolibItem = IcoLib_GetIconHandle("check_update");

 #endif

 	mi.pszName = LPGEN("Check for updates");

 	mi.pszService = MS_PU_CHECKUPDATES;