From ba430f779e1f3692d563c48b3517915429bd393d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 11 Apr 2013 08:04:17 +0000 Subject: status icons almost recovered git-svn-id: http://svn.miranda-ng.org/main/trunk@4420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/statusicon.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/statusicon.cpp b/plugins/Scriver/src/statusicon.cpp index a51cdd22d5..b6879370f3 100644 --- a/plugins/Scriver/src/statusicon.cpp +++ b/plugins/Scriver/src/statusicon.cpp @@ -30,9 +30,8 @@ void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap) HICON hIcon; int x = r.left; - StatusIconData *si; int nIcon = 0; - while ((si = (StatusIconData*)CallService(MS_MSG_GETNTHICON, (WPARAM)hContact, nIcon++)) != NULL) { + while (StatusIconData *si = Srmm_GetNthIcon(hContact, nIcon++)) { if ((si->flags & MBF_DISABLED) && si->hIconDisabled) hIcon = si->hIconDisabled; else hIcon = si->hIcon; @@ -46,7 +45,7 @@ void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap) void CheckStatusIconClick(HANDLE hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int click_flags) { unsigned int iconNum = (pt.x - r.left) / (GetSystemMetrics(SM_CXSMICON) + gap) + 1; - StatusIconData *si = (StatusIconData*)CallService(MS_MSG_GETNTHICON, (WPARAM)hContact, iconNum); + StatusIconData *si = Srmm_GetNthIcon(hContact, iconNum); if (si == NULL) return; @@ -92,7 +91,7 @@ int DeinitStatusIcons() int GetStatusIconsCount(HANDLE hContact) { int nIcon = 0; - while ( CallService(MS_MSG_GETNTHICON, (WPARAM)hContact, nIcon) != NULL) + while ( Srmm_GetNthIcon(hContact, nIcon) != NULL) nIcon++; return nIcon; } -- cgit v1.2.3