MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls

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

2 files changed, 15 insertions, 15 deletions

diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp
index c6ef0f73fb..4ce4b7df3a 100644
--- a/plugins/TrafficCounter/src/TrafficCounter.cpp
+++ b/plugins/TrafficCounter/src/TrafficCounter.cpp
@@ -495,7 +495,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 				if (unOptions.DrawProtoIcon)

 				{

 					TC_DrawIconEx(hdc, rect.left, rect.top,

-						LoadSkinnedProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name,PS_GETSTATUS,0,0)), b, ClistModernPresent);

+						Skin_LoadProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name,PS_GETSTATUS,0,0)), b, ClistModernPresent);

 					dx = 19;

 				}

 				// Изображаем имя аккаунта

@@ -562,7 +562,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 			if (unOptions.DrawProtoIcon)

 			{

 				TC_DrawIconEx(hdc, rect.left, rect.top,

-					LoadSkinnedIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);

+					Skin_LoadIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);

 				dx = 19;

 			}

 			// Выводим текст

@@ -624,7 +624,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 			if (unOptions.DrawProtoIcon)

 			{

 				TC_DrawIconEx(hdc, rect.left, rect.top,

-					LoadSkinnedIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);

+					Skin_LoadIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);

 				dx = 19;

 			}

 			// Выводим текст

@@ -682,7 +682,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 				ahIcon = (HICON*)mir_realloc(ahIcon, sizeof(HICON) * (RowsNumber + 1));

 

 				ExtraText[RowsNumber] = mir_a2t(ProtoList[i].name);

-				ahIcon[RowsNumber++] = LoadSkinnedProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name, PS_GETSTATUS, 0, 0));

+				ahIcon[RowsNumber++] = Skin_LoadProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name, PS_GETSTATUS, 0, 0));

 			}

 		}

 		// Ещё 2 особых элемента.

@@ -692,7 +692,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 			ahIcon = (HICON*)mir_realloc(ahIcon, sizeof(HICON) * (RowsNumber + 1));

 

 			ExtraText[RowsNumber] = mir_a2t("summary");

-			ahIcon[RowsNumber++] = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+			ahIcon[RowsNumber++] = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 		}

 		if (unOptions.ShowOverall)

 		{

@@ -700,7 +700,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC)
 			ahIcon = (HICON*)mir_realloc(ahIcon, sizeof(HICON) * (RowsNumber + 1));

 

 			ExtraText[RowsNumber] = mir_a2t("overall");

-			ahIcon[RowsNumber++] = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+			ahIcon[RowsNumber++] = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 		}

 

 		// Рисуем свой счётчик для каждого из выбранных протоколов

@@ -1135,7 +1135,7 @@ void NotifyOnSend(void)
 

 	memset(&ppd, 0, sizeof(ppd));

 	ppd.lchContact = NULL;

-	ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	ppd.lchIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	_tcsncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"), MAX_CONTACTNAME);

 	//

 	mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("%d kilobytes sent"),

@@ -1154,7 +1154,7 @@ void NotifyOnRecv(void)
 

 	memset(&ppd, 0, sizeof(ppd));

 	ppd.lchContact = NULL;

-	ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	ppd.lchIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	_tcsncpy(ppd.lptzContactName, TranslateT("Traffic counter notification"),MAX_CONTACTNAME);

 	//

 	mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("%d kilobytes received"),

diff --git a/plugins/TrafficCounter/src/opttree.cpp b/plugins/TrafficCounter/src/opttree.cpp
index ced9f4db3e..792b0022ef 100644
--- a/plugins/TrafficCounter/src/opttree.cpp
+++ b/plugins/TrafficCounter/src/opttree.cpp
@@ -176,13 +176,13 @@ BOOL  OptTree_ProcessMessage(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
 			TreeView_DeleteAllItems(hwndTree);

 

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

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK));	// check on

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK));	// check off

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_TICK));	// radio on

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_NOTICK));	// radio on

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPOPEN));

-			ImageList_ReplaceIcon(hImgLst, -1, (HICON)LoadSkinnedIcon(SKINICON_OTHER_GROUPSHUT));

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_MIRANDA));

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_TICK));	// check on

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// check off

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_TICK));	// radio on

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_NOTICK));	// radio on

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_GROUPOPEN));

+			ImageList_ReplaceIcon(hImgLst, -1, (HICON)Skin_LoadIcon(SKINICON_OTHER_GROUPSHUT));

 			TreeView_SetImageList(hwndTree, hImgLst, TVSIL_NORMAL);

 

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