From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jul 2016 14:23:31 +0000
Subject: less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FloatingContacts/src/bitmap_funcs.cpp | 2 +-
 plugins/FloatingContacts/src/main.cpp         | 2 +-
 plugins/FloatingContacts/src/thumbs.cpp       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/FloatingContacts/src')

diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp
index 4db3c8f07c..577bd7ecc7 100644
--- a/plugins/FloatingContacts/src/bitmap_funcs.cpp
+++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp
@@ -699,7 +699,7 @@ void MyBitmap::DrawIcon(HICON hic, int x, int y, int w, int h)
 // slightly modified and integrated to MyBitmap class
 void MyBitmap::DrawText(wchar_t *str, int x, int y, int blur, int strength)
 {
-	SIZE sz; GetTextExtentPoint32(this->getDC(), str, (int)mir_tstrlen(str), &sz);
+	SIZE sz; GetTextExtentPoint32(this->getDC(), str, (int)mir_wstrlen(str), &sz);
 	sz.cx += (blur + 2) * 2; sz.cy += (blur + 2) * 2;
 	x -= blur + 2; y -= blur + 2;
 
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index ac8d80cadc..dbd018a81a 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -570,7 +570,7 @@ static void CreateBackgroundBrush()
 	}
 
 	if (db_get_b(NULL, MODULE, "BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP)) {
-		ptrT tszBitmapName(db_get_tsa(NULL, MODULE, "BkBitmap"));
+		ptrW tszBitmapName(db_get_tsa(NULL, MODULE, "BkBitmap"));
 		if (tszBitmapName != NULL)
 			hBmpBackground = Bitmap_Load(tszBitmapName);
 	}
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp
index a5d901bdd6..e394581046 100644
--- a/plugins/FloatingContacts/src/thumbs.cpp
+++ b/plugins/FloatingContacts/src/thumbs.cpp
@@ -271,7 +271,7 @@ void ThumbInfo::ResizeThumb()
 
 	// Get text and icon sizes
 	SIZEL sizeText;
-	GetTextExtentPoint32(hdc, ptszName, (int)mir_tstrlen(ptszName), &sizeText);
+	GetTextExtentPoint32(hdc, ptszName, (int)mir_wstrlen(ptszName), &sizeText);
 
 	SelectObject(hdc, hOldFont);
 
@@ -624,7 +624,7 @@ void ThumbInfo::UpdateContent()
 	hOldFont = (HFONT)SelectObject(hdcDraw, hFont[index]);
 
 	SIZE szText;
-	GetTextExtentPoint32(hdcDraw, ptszName, (int)mir_tstrlen(ptszName), &szText);
+	GetTextExtentPoint32(hdcDraw, ptszName, (int)mir_wstrlen(ptszName), &szText);
 	SetTextColor(hdcDraw, bkColor);
 
 	// simple border
-- 
cgit v1.2.3