diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-04-28 08:14:32 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-04-28 08:14:32 +0000 |
| commit | b612f28362fe77f5a6cf8f8b75a0ac86167c7777 (patch) | |
| tree | 42a40218246722d3391bed4e222623608ca9b6ad /plugins/Clist_nicer | |
| parent | ceaff728d741c2c03378f63cb87480052fdc716f (diff) | |
minus ansi function
git-svn-id: http://svn.miranda-ng.org/main/trunk@13222 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/src/clcpaint.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clcutils.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 5eda1289d4..1b63554991 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -505,7 +505,7 @@ set_bg_l: else
ChangeToFont(hdcMem, dat, FONTID_CONTACTS, &fontHeight);
- char *szCounts = NULL;
+ TCHAR *szCounts = NULL;
if (type == CLCIT_GROUP) {
GetTextExtentPoint32(hdcMem, contact->szText, (int)mir_tstrlen(contact->szText), &textSize);
int width = textSize.cx;
@@ -513,7 +513,7 @@ set_bg_l: if (szCounts[0]) {
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;
}
}
@@ -1008,7 +1008,7 @@ bgskipped: int labelWidth = textSize.cx + countsSize.cx + spaceSize.cx;
int offset = (g_center) ? ((rc.right - rc.left) - labelWidth) / 2 : 0;
- TextOutA(hdcMem, rc.left + offset + textSize.cx + spaceSize.cx, rc.top + groupCountsFontTopShift, szCounts, (int)mir_strlen(szCounts));
+ TextOut(hdcMem, rc.left + offset + textSize.cx + spaceSize.cx, rc.top + groupCountsFontTopShift, szCounts, (int)mir_tstrlen(szCounts));
rightLineStart = rc.left + offset + textSize.cx + spaceSize.cx + countsSize.cx + 2;
if (selected && !g_ignoreselforgroups)
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 3cab8d60d3..2a213032ed 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -167,13 +167,13 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, ClcContact *hitcontac GetTextExtentPoint32(hdc, hitcontact->szText, (int)mir_tstrlen(hitcontact->szText), &textSize);
width = textSize.cx;
if (hitcontact->type == CLCIT_GROUP) {
- char *szCounts;
+ TCHAR *szCounts;
szCounts = pcli->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;
}
}
@@ -308,13 +308,13 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **c GetTextExtentPoint32(hdc, hitcontact->szText, (int)mir_tstrlen(hitcontact->szText), &textSize);
width = textSize.cx;
if (hitcontact->type == CLCIT_GROUP) {
- char *szCounts;
+ TCHAR *szCounts;
szCounts = pcli->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;
}
}
|