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 --- src/core/stdmsg/src/statusicon.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/stdmsg') diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 68ad9d25d5..25e7813615 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -42,9 +42,9 @@ void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap) HICON hIcon; int x = r.left; - StatusIconData *sid; int nIcon = 0; - while ((sid = (StatusIconData*)CallService(MS_MSG_GETNTHICON, (WPARAM)hContact, nIcon++)) != NULL && x < r.right) { + StatusIconData *sid; + while ((sid = Srmm_GetNthIcon(hContact, nIcon++)) != 0 && x < r.right) { if ((sid->flags & MBF_DISABLED) && sid->hIconDisabled) hIcon = sid->hIconDisabled; else hIcon = sid->hIcon; @@ -58,7 +58,7 @@ void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap) void CheckIconClick(HANDLE hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int click_flags) { int iconNum = (pt.x - r.left) / (GetSystemMetrics(SM_CXSMICON) + gap); - StatusIconData *sid = (StatusIconData*)CallService(MS_MSG_GETNTHICON, (WPARAM)hContact, iconNum); + StatusIconData *sid = Srmm_GetNthIcon(hContact, iconNum); if (sid == NULL) return; @@ -89,7 +89,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