minus ansi function

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

3 files changed, 13 insertions, 13 deletions

diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index f240d2e89a..36e5918a35 100644
--- a/src/core/stdclist/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
@@ -277,7 +277,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			int hottrack = dat->exStyle & CLS_EX_TRACKSELECT && group->cl.items[group->scanIndex]->type != CLCIT_DIVIDER && dat->iHotTrack == index;

 			SIZE textSize, countsSize, spaceSize;

 			int width, checkboxWidth;

-			char *szCounts;

+			TCHAR *szCounts;

 

 			// alternating grey

 			if (style & CLS_GREYALTERNATE && index & 1) {

@@ -320,9 +320,9 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 			if (group->cl.items[group->scanIndex]->type == CLCIT_GROUP) {

 				szCounts = pcli->pfnGetGroupCountsText(dat, group->cl.items[group->scanIndex]);

 				if (szCounts[0]) {

-					GetTextExtentPoint32A(hdcMem, " ", 1, &spaceSize);

+					GetTextExtentPoint32(hdcMem, _T(" "), 1, &spaceSize);

 					ChangeToFont(hdcMem, dat, FONTID_GROUPCOUNTS, &fontHeight);

-					GetTextExtentPoint32A(hdcMem, szCounts, (int)mir_strlen(szCounts), &countsSize);

+					GetTextExtentPoint32(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &countsSize);

 					width += spaceSize.cx + countsSize.cx;

 				}

 			}

@@ -435,7 +435,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 					if (rc.right < rc.left + 4)

 						rc.right = clRect.right + 1;

 					else

-						TextOutA(hdcMem, rc.right, rc.top + groupCountsFontTopShift, szCounts, (int)mir_strlen(szCounts));

+						TextOut(hdcMem, rc.right, rc.top + groupCountsFontTopShift, szCounts, (int)mir_tstrlen(szCounts));

 					ChangeToFont(hdcMem, dat, FONTID_GROUPS, &fontHeight);

 					if (selected)

 						SetTextColor(hdcMem, dat->selTextColour);

diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h
index c0100a6b8c..3a79db0804 100644
--- a/src/modules/clist/clc.h
+++ b/src/modules/clist/clc.h
@@ -71,7 +71,7 @@ void fnSaveStateAndRebuildList(HWND hwnd, struct ClcData *dat);
 LRESULT fnProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

 

 /* clcutils.c */

-char* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact);

+TCHAR* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact);

 int   fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **contact, ClcGroup **group, DWORD * flags);

 void  fnScrollTo(HWND hwnd, struct ClcData *dat, int desty, int noSmooth);

 void  fnEnsureVisible(HWND hwnd, struct ClcData *dat, int iItem, int partialOk);

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index b08c1a1c12..246c3ab893 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -29,10 +29,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 extern HANDLE hHideInfoTipEvent;

 

-char* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact)

+TCHAR* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact)

 {

 	if (contact->type != CLCIT_GROUP || !(dat->exStyle & CLS_EX_SHOWGROUPCOUNTS))

-		return "";

+		return _T("");

 

 	ClcGroup *group = contact->group, *topgroup = group;

 	int onlineCount = 0;

@@ -56,10 +56,10 @@ char* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact)
 		group->scanIndex++;

 	}

 	if (onlineCount == 0 && dat->exStyle & CLS_EX_HIDECOUNTSWHENEMPTY)

-		return "";

+		return _T("");

 

-	static char szName[32];

-	mir_snprintf(szName, SIZEOF(szName), "(%u/%u)", onlineCount, totalCount);

+	static TCHAR szName[32];

+	mir_sntprintf(szName, SIZEOF(szName), _T("(%u/%u)"), onlineCount, totalCount);

 	return szName;

 }

 

@@ -168,13 +168,13 @@ int fnHitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact *
 	GetTextExtentPoint32(hdc, hitcontact->szText, (int)mir_tstrlen(hitcontact->szText), &textSize);

 	int width = textSize.cx;

 	if (hitcontact->type == CLCIT_GROUP) {

-		char *szCounts;

+		TCHAR *szCounts;

 		szCounts = cli.pfnGetGroupCountsText(dat, hitcontact);

 		if (szCounts[0]) {

-			GetTextExtentPoint32A(hdc, " ", 1, &textSize);

+			GetTextExtentPoint32(hdc, _T(" "), 1, &textSize);

 			width += textSize.cx;

 			SelectObject(hdc, dat->fontInfo[FONTID_GROUPCOUNTS].hFont);

-			GetTextExtentPoint32A(hdc, szCounts, (int)mir_strlen(szCounts), &textSize);

+			GetTextExtentPoint32(hdc, szCounts, (int)mir_tstrlen(szCounts), &textSize);

 			width += textSize.cx;

 		}

 	}