diff options
Diffstat (limited to 'protocols/Weather')
| -rw-r--r-- | protocols/Weather/src/weather_contacts.cpp | 8 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_icons.cpp | 4 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_mwin.cpp | 2 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_popup.cpp | 2 | ||||
| -rw-r--r-- | protocols/Weather/src/weather_userinfo.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/protocols/Weather/src/weather_contacts.cpp b/protocols/Weather/src/weather_contacts.cpp index 9111ea3d92..fe9179867c 100644 --- a/protocols/Weather/src/weather_contacts.cpp +++ b/protocols/Weather/src/weather_contacts.cpp @@ -409,10 +409,10 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa case WM_DESTROY:
wndData = (CntSetWndDataType*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)wndData->hFile, 0);
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)wndData->hRename, 0);
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)wndData->hSrchAll, 0);
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)wndData->hUserDetail, 0);
+ Skin_ReleaseIcon(wndData->hFile);
+ Skin_ReleaseIcon(wndData->hRename);
+ Skin_ReleaseIcon(wndData->hSrchAll);
+ Skin_ReleaseIcon(wndData->hUserDetail);
mir_free(wndData);
SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);
diff --git a/protocols/Weather/src/weather_icons.cpp b/protocols/Weather/src/weather_icons.cpp index 791f9c7a2d..3f52cdc25a 100644 --- a/protocols/Weather/src/weather_icons.cpp +++ b/protocols/Weather/src/weather_icons.cpp @@ -68,7 +68,7 @@ HICON LoadIconEx(const char* name, BOOL big) {
char szSettingName[100];
mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", WEATHERPROTONAME, name);
- return (HICON)CallService(MS_SKIN2_GETICON, big, (LPARAM)szSettingName);
+ return Skin_GetIcon(szSettingName, big);
}
HANDLE GetIconHandle(const char* name)
@@ -82,5 +82,5 @@ HANDLE GetIconHandle(const char* name) void ReleaseIconEx(HICON hIcon)
{
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);
+ Skin_ReleaseIcon(hIcon);
}
diff --git a/protocols/Weather/src/weather_mwin.cpp b/protocols/Weather/src/weather_mwin.cpp index c5fa204f85..a9561e29c6 100644 --- a/protocols/Weather/src/weather_mwin.cpp +++ b/protocols/Weather/src/weather_mwin.cpp @@ -238,7 +238,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara DeleteObject(hfnt);
}
EndPaint(hwnd, &ps);
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);
+ Skin_ReleaseIcon(hIcon);
DBFreeVariant(&dbv);
}
break;
diff --git a/protocols/Weather/src/weather_popup.cpp b/protocols/Weather/src/weather_popup.cpp index 6b6b1d4ebd..134cb973fa 100644 --- a/protocols/Weather/src/weather_popup.cpp +++ b/protocols/Weather/src/weather_popup.cpp @@ -145,7 +145,7 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa return TRUE;
case UM_FREEPLUGINDATA:
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)PUGetPluginData(hWnd), 0);
+ Skin_ReleaseIcon((HICON)PUGetPluginData(hWnd));
return FALSE;
}
diff --git a/protocols/Weather/src/weather_userinfo.cpp b/protocols/Weather/src/weather_userinfo.cpp index 0374b801cc..be964dceea 100644 --- a/protocols/Weather/src/weather_userinfo.cpp +++ b/protocols/Weather/src/weather_userinfo.cpp @@ -114,7 +114,7 @@ INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa break;
case WM_DESTROY:
- CallService(MS_SKIN2_RELEASEICON, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_INFOICON, STM_SETICON, 0, 0), 0);
+ Skin_ReleaseIcon((HICON)SendDlgItemMessage(hwndDlg, IDC_INFOICON, STM_SETICON, 0, 0));
DeleteObject((HFONT)SendDlgItemMessage(hwndDlg, IDC_INFO2, WM_GETFONT, 0, 0));
break;
|