- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 4 deletions

diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp
index 1ad1395032..060f950aa0 100644
--- a/src/core/stdmsg/src/statusicon.cpp
+++ b/src/core/stdmsg/src/statusicon.cpp
@@ -26,7 +26,7 @@ HANDLE hHookIconPressedEvt;
 

 static int OnSrmmIconChanged(WPARAM wParam, LPARAM)

 {

-	HANDLE hContact = (HANDLE)wParam;

+	HCONTACT hContact = (HCONTACT)wParam;

 	if (hContact == NULL)

 		WindowList_Broadcast(g_dat.hMessageWindowList, DM_STATUSICONCHANGE, 0, 0);

 	else {

@@ -37,7 +37,7 @@ static int OnSrmmIconChanged(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap)

+void DrawStatusIcons(HCONTACT hContact, HDC hDC, RECT r, int gap)

 {

 	HICON hIcon;

 	int x = r.left;

@@ -55,7 +55,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)

+void CheckIconClick(HCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int click_flags)

 {

 	int iconNum = (pt.x - r.left) / (GetSystemMetrics(SM_CXSMICON) + gap);

 	StatusIconData *sid = Srmm_GetNthIcon(hContact, iconNum);

@@ -88,7 +88,7 @@ int DeinitStatusIcons()
 	return 0;

 }

 

-int GetStatusIconsCount(HANDLE hContact)

+int GetStatusIconsCount(HCONTACT hContact)

 {

 	int nIcon = 0;

 	while ( Srmm_GetNthIcon(hContact, nIcon) != NULL)