- 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

5 files changed, 17 insertions, 17 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 2f3a6d4313..d5e740ecac 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -93,16 +93,16 @@ static int clcHookIconsChanged(WPARAM, LPARAM)
 	hAvatarOverlays = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, SIZEOF(g_pAvatarOverlayIcons) * 2, 1);
 
 	for (i = 0; i < SIZEOF(g_pAvatarOverlayIcons); i++) {
-		HICON hIcon = Skin_GetIcon(g_pAvatarOverlayIcons[i].name);
+		HICON hIcon = IcoLib_GetIcon(g_pAvatarOverlayIcons[i].name);
 		g_pAvatarOverlayIcons[i].listID = ImageList_AddIcon(hAvatarOverlays, hIcon);
-		Skin_ReleaseIcon(g_pAvatarOverlayIcons[i].name);
+		IcoLib_Release(g_pAvatarOverlayIcons[i].name);
 
-		hIcon = Skin_GetIcon(g_pStatusOverlayIcons[i].name);
+		hIcon = IcoLib_GetIcon(g_pStatusOverlayIcons[i].name);
 		g_pStatusOverlayIcons[i].listID = ImageList_AddIcon(hAvatarOverlays, hIcon);
-		Skin_ReleaseIcon(g_pStatusOverlayIcons[i].name);
+		IcoLib_Release(g_pStatusOverlayIcons[i].name);
 	}
 
-	g_hListeningToIcon = Skin_GetIcon("LISTENING_TO_ICON");
+	g_hListeningToIcon = IcoLib_GetIcon("LISTENING_TO_ICON");
 
 	pcli->pfnClcBroadcast(INTM_INVALIDATE, 0, 0);
 	AniAva_UpdateOptions();
@@ -1637,7 +1637,7 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 	TCHAR szMyPath[MAX_PATH];
 	GetModuleFileName(g_hInst, szMyPath, SIZEOF(szMyPath));
 
-	SKINICONDESC sid = { 0 };

+	SKINICONDESC sid = { 0 };
 	sid.cx = sid.cy = 16;
 	sid.defaultFile.t = szMyPath;
 	sid.flags = SIDF_PATH_TCHAR;
@@ -1646,14 +1646,14 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 	sid.description.a = LPGEN("Listening to");
 	sid.pszName = "LISTENING_TO_ICON";
 	sid.iDefaultIndex = -IDI_LISTENING_TO;
-	Skin_AddIcon(&sid);
+	IcoLib_AddIcon(&sid);
 
 	sid.section.a = LPGEN("Contact list") "/" LPGEN("Avatar overlay");
 	for (int i = 0; i < SIZEOF(g_pAvatarOverlayIcons); i++) {
 		sid.description.a = g_pAvatarOverlayIcons[i].description;
 		sid.pszName = g_pAvatarOverlayIcons[i].name;
 		sid.iDefaultIndex = -g_pAvatarOverlayIcons[i].id;
-		Skin_AddIcon(&sid);
+		IcoLib_AddIcon(&sid);
 	}
 
 	sid.section.a = LPGEN("Contact list") "/" LPGEN("Status overlay");
@@ -1661,7 +1661,7 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 		sid.description.a = g_pStatusOverlayIcons[i].description;
 		sid.pszName = g_pStatusOverlayIcons[i].name;
 		sid.iDefaultIndex = -g_pStatusOverlayIcons[i].id;
-		Skin_AddIcon(&sid);
+		IcoLib_AddIcon(&sid);
 	}
 
 	clcHookIconsChanged(0, 0);
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index b1ea419cb8..984f3fb499 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -1566,7 +1566,7 @@ HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName, char *szDesc
 		sid.iDefaultIndex = -iDefaultResource;

 	}

 

-	return Skin_AddIcon(&sid);

+	return IcoLib_AddIcon(&sid);

 }

 

 // MAIN WINPROC MESSAGE HANDLERS

@@ -2486,7 +2486,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam)
 			DrawState(dis->hDC, NULL, NULL, (LPARAM)hIcon, 0, x, y, 0, 0,

 				DST_ICON | (dis->itemState & ODS_INACTIVE && (((FALSE))) ? DSS_DISABLED : DSS_NORMAL));

 

-			Skin_ReleaseIcon(hIcon);

+			IcoLib_ReleaseIcon(hIcon);

 			nMirMenuState = dis->itemState;

 		}

 		else {

@@ -2533,7 +2533,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam)
 		mir_snprintf(buf, "Main,ID=MainMenu,Selected=%s,Hot=%s", (dis->itemState&ODS_SELECTED) ? "True" : "False", (dis->itemState&ODS_HOTLIGHT) ? "True" : "False");

 		SkinDrawGlyph(dis->hDC, &dis->rcItem, &dis->rcItem, buf);

 		DrawState(dis->hDC, NULL, NULL, (LPARAM)hIcon, 0, (dis->rcItem.right + dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2 + dx, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2 + dx, 0, 0, DST_ICON);

-		Skin_ReleaseIcon(hIcon);

+		IcoLib_ReleaseIcon(hIcon);

 		nMirMenuState = dis->itemState;

 	}

 

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index e89d5616ab..1d71974683 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -506,7 +506,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 						HICON hLockOverlay = LoadSkinnedIcon(SKINICON_OTHER_STATUS_LOCKED);

 						if (hLockOverlay != NULL) {

 							ske_DrawIconEx(hDC, x, iconY, hLockOverlay, iconWidth, iconHeight, 0, NULL, DI_NORMAL | dim);

-							Skin_ReleaseIcon(hLockOverlay);

+							IcoLib_ReleaseIcon(hLockOverlay);

 						}

 					}

 				}

@@ -514,7 +514,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 				if (bNeedDestroy)

 					DestroyIcon_protect(hIcon);

 				else

-					Skin_ReleaseIcon(hIcon);

+					IcoLib_ReleaseIcon(hIcon);

 				x += iconWidth + 1;

 				DeleteObject(rgn);

 			}

diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index 9d38947961..d78ab4ba15 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -423,12 +423,12 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT  msg, WPARAM wParam
 

 	case MBM_SETICOLIBHANDLE:

 		bct->hIcolibHandle = (HANDLE)lParam;

-		bct->hIcon = (bct->hIcolibHandle) ? Skin_GetIconByHandle(bct->hIcolibHandle) : NULL;

+		bct->hIcon = (bct->hIcolibHandle) ? IcoLib_GetIconByHandle(bct->hIcolibHandle) : NULL;

 		return 1;

 

 	case MBM_REFRESHICOLIBICON:

 		if (bct->hIcolibHandle)

-			bct->hIcon = Skin_GetIconByHandle(bct->hIcolibHandle);

+			bct->hIcon = IcoLib_GetIconByHandle(bct->hIcolibHandle);

 		else

 			bct->hIcon = NULL;

 		InvalidateRect(hwndDlg, NULL, TRUE);

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index cd53b1e77b..5f04741f66 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -646,7 +646,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			for (i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

 				HICON hIcon = LoadSkinnedProtoIcon(NULL, i);

 				ImageList_AddIcon(himlViewModes, hIcon);

-				Skin_ReleaseIcon(hIcon);

+				IcoLib_ReleaseIcon(hIcon);

 			}

 

 			HICON hIcon = (HICON)LoadImage(g_hMirApp, MAKEINTRESOURCE(IDI_SMALLDOT), IMAGE_ICON, 16, 16, 0);