From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Jul 2016 12:36:34 +0000
Subject: no more TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ModernOpt/src/modernopt.cpp     | 4 ++--
 plugins/ModernOpt/src/mopt_home.cpp     | 4 ++--
 plugins/ModernOpt/src/mopt_selector.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/ModernOpt/src')

diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index 9f7716d456..4743e8394c 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -192,7 +192,7 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT  msg, WPARAM wParam,
 			if (g_ModernOptPages[i].bShow && g_ModernOptPages[i].bShowTab)
 			{
 				HICON hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(g_ModernOptPages[i].iIcon), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
-				MIcoTab_AddItem(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzTitle), hIcon, i, FALSE);
+				MIcoTab_AddItem(hwndCtrl, TranslateW(g_ModernOptPages[i].lpzTitle), hIcon, i, FALSE);
 				DestroyIcon(hIcon);
 			}
 
@@ -428,7 +428,7 @@ static void ModernOptUI_SelectSection(HWND hwndDlg, struct ModernOptionsData *da
 			tvis.hParent = TVI_ROOT;
 			tvis.hInsertAfter = TVI_LAST;
 			tvis.item.mask = TVIF_IMAGE|TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE|TVIF_PARAM;
-			tvis.item.pszText = TranslateTS(obj->optObject.lptzSubsection);
+			tvis.item.pszText = TranslateW(obj->optObject.lptzSubsection);
 			tvis.item.iImage = tvis.item.iSelectedImage = obj->iTreeImageIndex;
 			tvis.item.lParam = i;
 			TreeView_InsertItem(hwndTree, &tvis);
diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp
index 53b1f3c919..17ec383e16 100644
--- a/plugins/ModernOpt/src/mopt_home.cpp
+++ b/plugins/ModernOpt/src/mopt_home.cpp
@@ -41,8 +41,8 @@ INT_PTR CALLBACK ModernOptHome_DlgProc(HWND hwndDlg, UINT  msg, WPARAM wParam, L
 				if (g_ModernOptPages[i].bShow) {
 					HICON hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(g_ModernOptPages[i].iIcon), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR);
 					MDescButton_SetIcon(hwndCtrl, hIcon);
-					MDescButton_SetTitle(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzTitle));
-					MDescButton_SetDescription(hwndCtrl, TranslateTS(g_ModernOptPages[i].lpzDescription));
+					MDescButton_SetTitle(hwndCtrl, TranslateW(g_ModernOptPages[i].lpzTitle));
+					MDescButton_SetDescription(hwndCtrl, TranslateW(g_ModernOptPages[i].lpzDescription));
 					DestroyIcon(hIcon);
 				}
 				else ShowWindow(hwndCtrl, SW_HIDE);
diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp
index 24c7ebb47c..6af988e4ae 100644
--- a/plugins/ModernOpt/src/mopt_selector.cpp
+++ b/plugins/ModernOpt/src/mopt_selector.cpp
@@ -46,7 +46,7 @@ static void sttPreviewSkin(MODERNOPTOBJECT *obj, wchar_t *fn, LPDRAWITEMSTRUCT l
 		return;
 	}
 
-	HBITMAP hbmPreview = Bitmap_Load(CMString(fn) + L".png");
+	HBITMAP hbmPreview = Bitmap_Load(CMStringW(fn) + L".png");
 	if (!hbmPreview)
 		return;
 
-- 
cgit v1.2.3