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/TopToolBar/src/stdafx.h | 2 +- plugins/TopToolBar/src/toolbar.cpp | 2 +- plugins/TopToolBar/src/toolbarwnd.cpp | 6 +++--- plugins/TopToolBar/src/topbutton.cpp | 6 +++--- plugins/TopToolBar/src/ttbopt.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/TopToolBar') diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h index 85b32c1e60..babf433470 100644 --- a/plugins/TopToolBar/src/stdafx.h +++ b/plugins/TopToolBar/src/stdafx.h @@ -25,7 +25,7 @@ #include "version.h" #include "BkgrCfg.h" -#define TTB_BUTTON_CLASS _T("TopToolbarButtonClass") +#define TTB_BUTTON_CLASS L"TopToolbarButtonClass" #define TTB_REPOSBUTTONS (WM_USER+10) #define TTB_UPDATEFRAMEVISIBILITY (WM_USER+11) diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index c4efd68b71..9b6f9721f0 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -79,7 +79,7 @@ void InsertLBut(int i) ttb.hIconDn = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_RUN), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); ttb.dwFlags = TTBBF_VISIBLE | TTBBF_ISLBUTTON | TTBBF_INTERNAL; ttb.name = LPGEN("Default"); - ttb.program = _T("Execute Path"); + ttb.program = L"Execute Path"; ttb.wParamDown = i; TTBAddButton((WPARAM)&ttb, 0); } diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp index 88e2442851..56577b4703 100644 --- a/plugins/TopToolBar/src/toolbarwnd.cpp +++ b/plugins/TopToolBar/src/toolbarwnd.cpp @@ -5,7 +5,7 @@ COLORREF bkColour; HBITMAP hBmpBackground, hBmpSeparator; int backgroundBmpUse; -static TCHAR pluginname[] = _T("TopToolBar"); +static TCHAR pluginname[] = L"TopToolBar"; ///////////////////////////////////////////////////////////////////////////////////////// // Toolbar window procedure @@ -257,7 +257,7 @@ INT_PTR OnEventFire(WPARAM wParam, LPARAM) RegisterClass(&wndclass); g_ctrl->pButtonList = (SortedList *)&Buttons; - g_ctrl->hWnd = CreateWindow(pluginname, _T("Toolbar"), + g_ctrl->hWnd = CreateWindow(pluginname, L"Toolbar", WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, g_ctrl->nLastHeight, parent, NULL, hInst, NULL); SetWindowLongPtr(g_ctrl->hWnd, 0, (LONG_PTR)g_ctrl); @@ -273,7 +273,7 @@ INT_PTR OnEventFire(WPARAM wParam, LPARAM) // if there's no customized frames, create our own if (g_ctrl->hFrame == NULL) { CLISTFrame Frame = { sizeof(Frame) }; - Frame.tname = _T("Toolbar"); + Frame.tname = L"Toolbar"; Frame.hWnd = g_ctrl->hWnd; Frame.align = alTop; Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_TCHAR; diff --git a/plugins/TopToolBar/src/topbutton.cpp b/plugins/TopToolBar/src/topbutton.cpp index 842553d2bb..1fe3eb2488 100644 --- a/plugins/TopToolBar/src/topbutton.cpp +++ b/plugins/TopToolBar/src/topbutton.cpp @@ -35,7 +35,7 @@ DWORD TopButtonInt::CheckFlags(DWORD Flags) } if (BitChanged(TTBBF_SHOWTOOLTIP)) { dwFlags ^= TTBBF_SHOWTOOLTIP; - SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)((dwFlags & TTBBF_SHOWTOOLTIP) ? ptszTooltip : _T("")), BATF_TCHAR); + SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)((dwFlags & TTBBF_SHOWTOOLTIP) ? ptszTooltip : L""), BATF_TCHAR); } // next settings changing visual side, requires additional actions if (BitChanged(TTBBF_VISIBLE)) { @@ -53,7 +53,7 @@ DWORD TopButtonInt::CheckFlags(DWORD Flags) void TopButtonInt::CreateWnd() { if (!(dwFlags & TTBBF_ISSEPARATOR)) { - hwnd = CreateWindow(TTB_BUTTON_CLASS, _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP | SS_NOTIFY, 0, 0, g_ctrl->nButtonWidth, g_ctrl->nButtonHeight, g_ctrl->hWnd, NULL, hInst, this); + hwnd = CreateWindow(TTB_BUTTON_CLASS, L"", BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP | SS_NOTIFY, 0, 0, g_ctrl->nButtonWidth, g_ctrl->nButtonHeight, g_ctrl->hWnd, NULL, hInst, this); if (dwFlags & TTBBF_ASPUSHBUTTON) SendMessage(hwnd, BUTTONSETASPUSHBTN, 1, 0); @@ -65,7 +65,7 @@ void TopButtonInt::CreateWnd() } // maybe SEPWIDTH, not g_ctrl->nButtonWidth? else - hwnd = CreateWindow(_T("STATIC"), _T(""), WS_CHILD | SS_NOTIFY, 0, 0, g_ctrl->nButtonWidth, g_ctrl->nButtonHeight, g_ctrl->hWnd, NULL, hInst, 0); + hwnd = CreateWindow(L"STATIC", L"", WS_CHILD | SS_NOTIFY, 0, 0, g_ctrl->nButtonWidth, g_ctrl->nButtonHeight, g_ctrl->hWnd, NULL, hInst, 0); SetWindowLongPtr(hwnd, GWLP_USERDATA, id); SetBitmap(); diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index fd2e528c75..f048adfda3 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -21,7 +21,7 @@ static HTREEITEM AddLine(HWND hTree,TopButtonInt *b, HTREEITEM hItem, HIMAGELIST TCHAR* tmp; if (b->dwFlags & TTBBF_ISSEPARATOR) { - tvis.item.pszText = _T("------------------"); + tvis.item.pszText = L"------------------"; index = -1; tmp = 0; } @@ -251,7 +251,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER; ofn.nMaxFile = _countof(str); ofn.nMaxFileTitle = MAX_PATH; - ofn.lpstrDefExt = _T("exe"); + ofn.lpstrDefExt = L"exe"; if (!GetOpenFileName(&ofn)) break; @@ -309,7 +309,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ttb.hIconDn = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_RUN), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); ttb.dwFlags = TTBBF_VISIBLE | TTBBF_ISLBUTTON | TTBBF_INTERNAL | TTBBF_OPTIONAL; ttb.name = LPGEN("Default"); - ttb.program = _T("Execute Path"); + ttb.program = L"Execute Path"; TopButtonInt* b = CreateButton(&ttb); // get selection for insert -- cgit v1.2.3