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

4 files changed, 10 insertions, 10 deletions

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index 4c4980ed46..bd99e5df8b 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -142,10 +142,10 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 

 		wndData = ( CntSetWndDataType* )mir_alloc(sizeof(CntSetWndDataType));

 		wndData->hContact = hContact = lParam;

-		wndData->hRename = LoadSkinnedIcon(SKINICON_OTHER_RENAME);

-		wndData->hUserDetail = LoadSkinnedIcon(SKINICON_OTHER_USERDETAILS);

-		wndData->hFile = LoadSkinnedIcon(SKINICON_EVENT_FILE);

-		wndData->hSrchAll = LoadSkinnedIcon(SKINICON_OTHER_SEARCHALL);

+		wndData->hRename = Skin_LoadIcon(SKINICON_OTHER_RENAME);

+		wndData->hUserDetail = Skin_LoadIcon(SKINICON_OTHER_USERDETAILS);

+		wndData->hFile = Skin_LoadIcon(SKINICON_EVENT_FILE);

+		wndData->hSrchAll = Skin_LoadIcon(SKINICON_OTHER_SEARCHALL);

 

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)wndData);

 

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 7c91da6ffc..921e1b7275 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -155,11 +155,11 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 					int statusIcon = db_get_w(data->hContact, WEATHERPROTONAME, "Status", 0);

 

 					picSize = GetSystemMetrics(SM_CXICON);

-					hIcon = LoadSkinnedProtoIconBig(WEATHERPROTONAME, statusIcon);

+					hIcon = Skin_LoadProtoIcon(WEATHERPROTONAME, statusIcon, true);

 					if ((INT_PTR)hIcon == CALLSERVICE_NOTFOUND)

 					{

 						picSize = GetSystemMetrics(SM_CXSMICON);

-						hIcon = LoadSkinnedProtoIcon(WEATHERPROTONAME, statusIcon);

+						hIcon = Skin_LoadProtoIcon(WEATHERPROTONAME, statusIcon);

 					}

 				}

 

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 3ae6f80032..3b08a3c1a5 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -43,7 +43,7 @@ int WeatherPopup(WPARAM hContact, LPARAM lParam)
 		// setup the popup

 		POPUPDATAT ppd = { 0 };

 		ppd.lchContact = hContact;

-		ppd.PluginData = ppd.lchIcon = LoadSkinnedProtoIcon(WEATHERPROTONAME, winfo.status);

+		ppd.PluginData = ppd.lchIcon = Skin_LoadProtoIcon(WEATHERPROTONAME, winfo.status);

 		GetDisplay(&winfo, opt.pTitle, ppd.lptzContactName);

 		GetDisplay(&winfo, opt.pText, ppd.lptzText);

 		ppd.PluginWindowProc = PopupDlgProc;

diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index 564e8e48ee..af318beeb2 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -77,7 +77,7 @@ INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		SetDlgItemText(hwndDlg, IDC_INFO1, GetDisplay(&w, TranslateT("Current condition for %n"), str));

 

 		SendDlgItemMessage(hwndDlg, IDC_INFOICON, STM_SETICON, 

-			(WPARAM)LoadSkinnedProtoIcon(WEATHERPROTONAME,

+			(WPARAM)Skin_LoadProtoIcon(WEATHERPROTONAME,

 			db_get_w(hContact, WEATHERPROTONAME, "StatusIcon",0)), 0);

 

 		{	// bold and enlarge the current condition

@@ -213,8 +213,8 @@ INT_PTR CALLBACK DlgProcMoreData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		// set icons

 		{

 			WORD statusIcon = db_get_w(hContact, WEATHERPROTONAME, "StatusIcon", 0);

-			ReleaseIconEx((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedProtoIconBig(WEATHERPROTONAME, statusIcon)));

-			ReleaseIconEx((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinnedProtoIcon(WEATHERPROTONAME, statusIcon)));

+			ReleaseIconEx((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadProtoIcon(WEATHERPROTONAME, statusIcon, true)));

+			ReleaseIconEx((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadProtoIcon(WEATHERPROTONAME, statusIcon)));

 		}

 		RedrawWindow(GetDlgItem(hwndDlg, IDC_HEADERBAR), NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW);

 		break;