From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan 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/UserInfoEx/src/dlg_propsheet.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/UserInfoEx/src/dlg_propsheet.cpp') diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 71f4fef8d7..e1c7a28f75 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -124,7 +124,7 @@ private: // check if icq is online if (!IsProtoOnline((*_pPd)->szModuleName)) MsgBox(_pPs->hDlg, MB_ICON_WARNING, TranslateT("Upload details"), - CMString(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)), + CMStringW(FORMAT, TranslateT("Protocol '%s' is offline"), _A2T((*_pPd)->szModuleName)), TranslateT("You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only.")); // start uploading process @@ -507,7 +507,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) if (lParam || bChangeDetailsEnabled) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = ghInst; - odp.flags = ODPF_ICON | ODPF_TCHAR; + odp.flags = ODPF_ICON | ODPF_UNICODE; odp.pwszGroup = IcoLib_GetDefaultIconFileName(); if (lParam) { @@ -1094,14 +1094,14 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar LPCTSTR pszName; if (!pPs->hContact) pszName = TranslateT("Owner"); - else if (pdbcws && pdbcws->value.type == DBVT_TCHAR) + else if (pdbcws && pdbcws->value.type == DBVT_WCHAR) pszName = pdbcws->value.ptszVal; else pszName = DB::Contact::DisplayName(pPs->hContact); HWND hName = GetDlgItem(hDlg, TXT_NAME); SetWindowText(hName, pszName); - SetWindowText(hDlg, CMString(FORMAT, L"%s - %s", pszName, TranslateT("edit contact information"))); + SetWindowText(hDlg, CMStringW(FORMAT, L"%s - %s", pszName, TranslateT("edit contact information"))); SetDlgItemText(hDlg, IDC_HEADERBAR, TranslateT("View personal user details and more")); // redraw the name control -- cgit v1.2.3