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

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index 04db33bed2..924a9fc2e2 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -281,7 +281,7 @@ int CreateFrame()
 		Frame.cbSize = sizeof(CLISTFrame);

 		Frame.hWnd = hwnd_frame;

 		Frame.align = alTop;

-		Frame.hIcon = LoadSkinnedIcon(SKINICON_OTHER_FRAME);

+		Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);

 		Frame.Flags = F_VISIBLE | F_SHOWTB | F_SHOWTBTIP | F_NOBORDER | F_SKINNED | F_TCHAR;

 		Frame.height = 100;

 		frame_id = CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);

@@ -332,7 +332,7 @@ int CreateFrame()
 		mi.popupPosition = -0x7FFFFFFF;

 		mi.ptszPopupName = LPGENT("My details");

 		mi.position = 1; // 500010000

-		mi.hIcon = LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS);

+		mi.hIcon = Skin_LoadIcon(SKINICON_OTHER_USERDETAILS);

 		mi.ptszName = LPGENT("Show my details");

 		mi.pszService = MODULE_NAME"/ShowHideMyDetails";

 		hMenuShowHideFrame = Menu_AddMainMenuItem(&mi);

@@ -1246,7 +1246,7 @@ void Draw(HWND hwnd, HDC hdc_orig)
 		if (proto->custom_status != 0 && ProtoServiceExists(proto->name, PS_GETCUSTOMSTATUSICON))

 			status_icon = (HICON)CallProtoService(proto->name, PS_GETCUSTOMSTATUSICON, proto->custom_status, LR_SHARED);

 		else

-			status_icon = LoadSkinnedProtoIcon(proto->name, proto->status);

+			status_icon = Skin_LoadProtoIcon(proto->name, proto->status);

 

 		if (status_icon != NULL) {

 			DrawIconEx(hdc, data->status_icon_rect.left, data->status_icon_rect.top, status_icon, ICON_SIZE, ICON_SIZE, 0, NULL, DI_NORMAL);

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index b731e71603..9b7d0742f0 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -89,7 +89,7 @@ static int MainInit(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.popupPosition = 500050000;

 	mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_USERDETAILS);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

 	mi.ptszName = LPGENT("My details");

 	HANDLE hMenuRoot = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp
index b9ec1cb21e..3c2e515bcc 100644
--- a/plugins/MyDetails/src/services.cpp
+++ b/plugins/MyDetails/src/services.cpp
@@ -44,7 +44,7 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam
 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, proto_num);

 

 		if (proto_num == -1) {

-			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

+			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_MIRANDA));

 

 			// All protos have the same nick?

 			if (protocols->GetSize() > 0) {

@@ -338,7 +338,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w
 			SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, proto->GetStatusMsg());

 		}

 		else if (data->status != 0) {

-			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedProtoIcon(NULL, data->status));

+			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadProtoIcon(NULL, data->status));

 

 			TCHAR title[256];

 			mir_sntprintf(title, SIZEOF(title), TranslateT("Set my status message for %s"),

@@ -348,7 +348,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w
 			SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status));

 		}

 		else {

-			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

+			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_MIRANDA));

 

 			SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg());

 		}