From 8ae3679aa1339ce9abee53adb69902bd6b7513dc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 25 Jul 2016 10:31:04 +0000 Subject: hello, Unix. phase 1: removing _T() git-svn-id: http://svn.miranda-ng.org/main/trunk@17127 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/wbOSD/src/options.cpp | 6 +++--- plugins/wbOSD/src/stdafx.h | 4 ++-- plugins/wbOSD/src/wbOSD.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/wbOSD/src') diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index 6f9dd76a48..de0c49a6cc 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -11,7 +11,7 @@ Distributed under GNU's GPL 2 or later COLORREF pencustcolors[16]; -const static osdmsg defstr = { _T(""), 0, RGB(0, 0, 0), 0, 0 }; +const static osdmsg defstr = { L"", 0, RGB(0, 0, 0), 0, 0 }; void FillCheckBoxTree(HWND hwndTree, DWORD style) { @@ -250,7 +250,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wparam, LPARAM lparam) { TCHAR buf[20]; - mir_sntprintf(buf, _T("%d %%"), ps->alpha * 100 / 255); + mir_sntprintf(buf, L"%d %%", ps->alpha * 100 / 255); SetDlgItemText(hDlg, IDC_ALPHATXT, buf); } @@ -266,7 +266,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wparam, LPARAM lparam) ps->alpha = SendDlgItemMessage(hDlg, IDC_SLIDER1, TBM_GETPOS, 0, 0); { TCHAR buf[20]; - mir_sntprintf(buf, _T("%d %%"), ps->alpha * 100 / 255); + mir_sntprintf(buf, L"%d %%", ps->alpha * 100 / 255); SetDlgItemText(hDlg, IDC_ALPHATXT, buf); } goto xxx; diff --git a/plugins/wbOSD/src/stdafx.h b/plugins/wbOSD/src/stdafx.h index aca31800a0..8e0d3f2248 100644 --- a/plugins/wbOSD/src/stdafx.h +++ b/plugins/wbOSD/src/stdafx.h @@ -40,7 +40,7 @@ Distributed under GNU's GPL 2 or later #define DEFAULT_FNT_CLIPRECISION 2 #define DEFAULT_FNT_QUALITY 1 #define DEFAULT_FNT_PITCHANDFAM 49 -#define DEFAULT_FNT_FACENAME _T("Arial") +#define DEFAULT_FNT_FACENAME L"Arial" #define DEFAULT_CLRMSG RGB(255, 100, 0) //fore #define DEFAULT_CLRSTATUS RGB(40, 160, 255) //fore @@ -62,7 +62,7 @@ Distributed under GNU's GPL 2 or later #define DEFAULT_ANNOUNCESTATUS 1 #define DEFAULT_ANNOUNCE 0x00000002 //status mask #define DEFAULT_SHOWMYSTATUS 1 -#define DEFAULT_MESSAGEFORMAT _T("Message from %n: %m") +#define DEFAULT_MESSAGEFORMAT L"Message from %n: %m" #define DEFAULT_SHOWMSGWIN 1 #define DEFAULT_SHOWWHEN 0x00000002 diff --git a/plugins/wbOSD/src/wbOSD.cpp b/plugins/wbOSD/src/wbOSD.cpp index 0a9e341244..5159a3b437 100644 --- a/plugins/wbOSD/src/wbOSD.cpp +++ b/plugins/wbOSD/src/wbOSD.cpp @@ -9,13 +9,13 @@ Distributed under GNU's GPL 2 or later #include "stdafx.h" -TCHAR szClassName[] = _T("wbOSD"); -const static osdmsg defstr = { _T(""), 0, RGB(0, 0, 0), 0, 0 }; +TCHAR szClassName[] = L"wbOSD"; +const static osdmsg defstr = { L"", 0, RGB(0, 0, 0), 0, 0 }; int DrawMe(HWND hwnd, TCHAR *string, COLORREF color) { logmsg("DrawMe"); - if (!string) string = _T("bullshit"); + if (!string) string = L"bullshit"; plgsettings plgs; loadDBSettings(&plgs); @@ -276,7 +276,7 @@ int MainInit(WPARAM, LPARAM) if (!RegisterClassEx(&wincl)) return 0; - g_hWnd = CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, szClassName, _T("WannaBeOSD"), + g_hWnd = CreateWindowEx(WS_EX_LAYERED | WS_EX_TOOLWINDOW, szClassName, L"WannaBeOSD", WS_POPUP, db_get_dw(NULL, THIS_MODULE, "winxpos", DEFAULT_WINXPOS), db_get_dw(NULL, THIS_MODULE, "winypos", DEFAULT_WINYPOS), -- cgit v1.2.3