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/IEView/src/Options.cpp | 4 ++-- plugins/IEView/src/TemplateHTMLBuilder.cpp | 4 ++-- plugins/IEView/src/Utils.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/IEView/src') diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 5e055c1cac..33f7a40fc2 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -439,7 +439,7 @@ int IEViewOptInit(WPARAM wParam, LPARAM) odp.hInstance = hInstance; odp.pwszGroup = LPGENW("Message sessions"); odp.pwszTitle = LPGENW("IEView"); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pszTemplate = MAKEINTRESOURCEA(tabPages[0].dlgId); odp.pfnDlgProc = tabPages[0].dlgProc; odp.pwszTab = tabPages[0].tabName; @@ -511,7 +511,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w { wchar_t* size[] = { L"320 x 205", L"480 x 385", L"560 x 349", L"640 x 390" }; for (int i = 0; i < _countof(size); ++i) { - int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateTS(size[i])); + int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateW(size[i])); SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETITEMDATA, item, 0); } SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETCURSEL, Options::getEmbedsize(), 0); diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index 438fa6f6ef..a1a7a3e565 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -52,14 +52,14 @@ char* TemplateHTMLBuilder::getAvatar(MCONTACT hContact, const char *szProto) MultiByteToWideChar(CP_ACP, 0, (char*)ace->szFilename, -1, tmpPath, _countof(tmpPath)); } } - if (!db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { + if (!db_get_ws(hContact, "ContactPhoto", "File", &dbv)) { if (mir_wstrlen(dbv.ptszVal) > 0) { //wchar_t *ext = wcsrchr(dbv.ptszVal, '.'); if (result == NULL) { /* relative -> absolute */ mir_wstrcpy(tmpPath, dbv.ptszVal); if (wcsncmp(tmpPath, L"http://", 7)) - PathToAbsoluteT(dbv.ptszVal, tmpPath); + PathToAbsoluteW(dbv.ptszVal, tmpPath); result = tmpPath; } } diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp index 56af00067a..009c01a19e 100644 --- a/plugins/IEView/src/Utils.cpp +++ b/plugins/IEView/src/Utils.cpp @@ -25,7 +25,7 @@ wchar_t Utils::base_dir[MAX_PATH]; const wchar_t *Utils::getBaseDir() { - PathToAbsoluteT(L"miranda32.exe", base_dir); + PathToAbsoluteW(L"miranda32.exe", base_dir); return base_dir; } -- cgit v1.2.3