From 4b01e299223c3fdb05d82ecde0117f88f8caa726 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 2 Dec 2014 22:20:16 +0000 Subject: less warnings git-svn-id: http://svn.miranda-ng.org/main/trunk@11224 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_privacy.cpp | 4 ++-- protocols/JabberG/src/ui_utils.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 2d0cdc792f..a827272696 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -945,7 +945,7 @@ BOOL CJabberDlgPrivacyLists::OnWmDrawItem(UINT, WPARAM, LPARAM lParam) for (i=0; i < SIZEOF(drawItems); i++) { SIZE sz = {0}; drawItems[i].text = TranslateTS(drawItems[i].textEng); - GetTextExtentPoint32(lpdis->hDC, drawItems[i].text, mir_tstrlen(drawItems[i].text), &sz); + GetTextExtentPoint32(lpdis->hDC, drawItems[i].text, (int)mir_tstrlen(drawItems[i].text), &sz); totalWidth += sz.cx + 18 + 5; // 18 pixels for icon, 5 pixel spacing } @@ -1052,7 +1052,7 @@ void CJabberDlgPrivacyLists::DrawNextRulePart(HDC hdc, COLORREF color, const TCH DrawText(hdc, text, -1, rc, DT_LEFT|DT_NOPREFIX|DT_SINGLELINE|DT_VCENTER|DT_WORD_ELLIPSIS); SIZE sz; - GetTextExtentPoint32(hdc, text, mir_tstrlen(text), &sz); + GetTextExtentPoint32(hdc, text, (int)mir_tstrlen(text), &sz); rc->left += sz.cx; } diff --git a/protocols/JabberG/src/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp index f20062aff5..6d64236639 100644 --- a/protocols/JabberG/src/ui_utils.cpp +++ b/protocols/JabberG/src/ui_utils.cpp @@ -853,7 +853,7 @@ void CCtrlListView::AddGroup(int iGroupId, TCHAR *name) lvg.cbSize = sizeof(lvg); lvg.mask = LVGF_HEADER | LVGF_GROUPID; lvg.pszHeader = name; - lvg.cchHeader = mir_tstrlen(lvg.pszHeader); + lvg.cchHeader = (int)mir_tstrlen(lvg.pszHeader); lvg.iGroupId = iGroupId; InsertGroup(-1, &lvg); } @@ -2316,7 +2316,7 @@ void CProtoIntDlgBase::UpdateProtoTitle(const TCHAR *szText) if (szText) { curText = szText; - curLength = mir_tstrlen(curText); + curLength = (int)mir_tstrlen(curText); } else { curLength = GetWindowTextLength(m_hwnd) + 1; @@ -2326,7 +2326,7 @@ void CProtoIntDlgBase::UpdateProtoTitle(const TCHAR *szText) } if (!_tcsstr(curText, m_proto_interface->m_tszUserName)) { - int length = curLength + mir_tstrlen(m_proto_interface->m_tszUserName) + 256; + size_t length = curLength + mir_tstrlen(m_proto_interface->m_tszUserName) + 256; TCHAR *text = (TCHAR *)_alloca(length * sizeof(TCHAR)); mir_sntprintf(text, length, _T("%s [%s: %s]"), curText, TranslateT("Account"), m_proto_interface->m_tszUserName); SetWindowText(m_hwnd, text); @@ -2339,7 +2339,7 @@ void CProtoIntDlgBase::UpdateStatusBar() HDC hdc = GetDC(m_hwndStatus); HFONT hFntSave = (HFONT)SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - GetTextExtentPoint32(hdc, m_proto_interface->m_tszUserName, mir_tstrlen(m_proto_interface->m_tszUserName), &sz); + GetTextExtentPoint32(hdc, m_proto_interface->m_tszUserName, (int)mir_tstrlen(m_proto_interface->m_tszUserName), &sz); sz.cx += GetSystemMetrics(SM_CXSMICON) * 3; SelectObject(hdc, hFntSave); ReleaseDC(m_hwndStatus, hdc); -- cgit v1.2.3