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/Clist_nicer/src/clcitems.cpp | 2 +- plugins/Clist_nicer/src/clcopts.cpp | 2 +- plugins/Clist_nicer/src/clcpaint.cpp | 4 ++-- plugins/Clist_nicer/src/clcutils.cpp | 14 +++++++------- plugins/Clist_nicer/src/clistevents.cpp | 2 +- plugins/Clist_nicer/src/clistmenus.cpp | 4 ++-- plugins/Clist_nicer/src/clui.cpp | 20 ++++++++++---------- plugins/Clist_nicer/src/cluiframes.cpp | 8 ++++---- plugins/Clist_nicer/src/cluiframes.h | 2 +- plugins/Clist_nicer/src/cluiservices.cpp | 2 +- plugins/Clist_nicer/src/config.cpp | 10 +++++----- plugins/Clist_nicer/src/coolsblib.cpp | 4 ++-- plugins/Clist_nicer/src/extBackg.cpp | 10 +++++----- plugins/Clist_nicer/src/statusbar.cpp | 4 ++-- plugins/Clist_nicer/src/viewmodes.cpp | 18 +++++++++--------- 15 files changed, 53 insertions(+), 53 deletions(-) (limited to 'plugins/Clist_nicer') diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index a015a15740..b6ebeb7cb3 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -410,7 +410,7 @@ int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData ptrT tszGroup(db_get_tsa(hContact, "CList", "Group")); if (tszGroup != NULL) { TCHAR szGroupMask[256]; - mir_sntprintf(szGroupMask, _T("%s|"), tszGroup); + mir_sntprintf(szGroupMask, L"%s|", tszGroup); int bHasGroup = _tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0; filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | bHasGroup) : (filterResult & bHasGroup); } diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 5a0f2bfb95..f20f3bb4e6 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -756,7 +756,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; ofn.nMaxFile = _countof(str); ofn.nMaxFileTitle = MAX_PATH; - ofn.lpstrDefExt = _T("bmp"); + ofn.lpstrDefExt = L"bmp"; if (!GetOpenFileName(&ofn)) break; SetDlgItemText(hwndDlg, IDC_FILENAME, str); diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index d54a4a6bcc..dd985a65fe 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -505,7 +505,7 @@ set_bg_l: int width = textSize.cx; szCounts = pcli->pfnGetGroupCountsText(dat, contact); if (szCounts[0]) { - GetTextExtentPoint32(hdcMem, _T(" "), 1, &spaceSize); + GetTextExtentPoint32(hdcMem, L" ", 1, &spaceSize); ChangeToFont(hdcMem, dat, FONTID_GROUPCOUNTS, &fontHeight); GetTextExtentPoint32(hdcMem, szCounts, (int)mir_tstrlen(szCounts), &countsSize); width += spaceSize.cx + countsSize.cx; @@ -1104,7 +1104,7 @@ bgskipped: int fHeight = 0; TCHAR szResult[80]; - if (TimeZone_PrintDateTime(cEntry->hTimeZone, _T("t"), szResult, _countof(szResult), 0)) + if (TimeZone_PrintDateTime(cEntry->hTimeZone, L"t", szResult, _countof(szResult), 0)) goto nodisplay; COLORREF oldColor = GetTextColor(hdcMem); diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 401918407b..626d421ae6 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -92,7 +92,7 @@ size_t MY_pathToAbsolute(const TCHAR *pSrc, TCHAR *pOut) return dwSrcLen; } if (pSrc[0] == '.') - return (mir_sntprintf(pOut, MAX_PATH, _T("%s\\%s"), cfg::dat.tszProfilePath, pSrc)); + return (mir_sntprintf(pOut, MAX_PATH, L"%s\\%s", cfg::dat.tszProfilePath, pSrc)); return 0; } @@ -170,7 +170,7 @@ int RTL_HitTest(HWND hwnd, struct ClcData *dat, int testx, ClcContact *hitcontac TCHAR *szCounts; szCounts = pcli->pfnGetGroupCountsText(dat, hitcontact); if (szCounts[0]) { - GetTextExtentPoint32(hdc, _T(" "), 1, &textSize); + GetTextExtentPoint32(hdc, L" ", 1, &textSize); width += textSize.cx; SelectObject(hdc, dat->fontInfo[FONTID_GROUPCOUNTS].hFont); GetTextExtentPoint32(hdc, szCounts, (int)mir_tstrlen(szCounts), &textSize); @@ -311,7 +311,7 @@ int HitTest(HWND hwnd, struct ClcData *dat, int testx, int testy, ClcContact **c TCHAR *szCounts; szCounts = pcli->pfnGetGroupCountsText(dat, hitcontact); if (szCounts[0]) { - GetTextExtentPoint32(hdc, _T(" "), 1, &textSize); + GetTextExtentPoint32(hdc, L" ", 1, &textSize); width += textSize.cx; SelectObject(hdc, dat->fontInfo[FONTID_GROUPCOUNTS].hFont); GetTextExtentPoint32(hdc, szCounts, (int)mir_tstrlen(szCounts), &textSize); @@ -536,7 +536,7 @@ void BeginRenameSelection(HWND hwnd, struct ClcData *dat) if (h < dat->fontInfo[i].fontHeight + 2) h = dat->fontInfo[i].fontHeight + 2; } - dat->hwndRenameEdit = CreateWindowEx(0, _T("RICHEDIT50W"), contact->szText, WS_CHILD | WS_BORDER | ES_MULTILINE | ES_AUTOHSCROLL, x, y, clRect.right - x, h, hwnd, NULL, g_hInst, NULL); + dat->hwndRenameEdit = CreateWindowEx(0, L"RICHEDIT50W", contact->szText, WS_CHILD | WS_BORDER | ES_MULTILINE | ES_AUTOHSCROLL, x, y, clRect.right - x, h, hwnd, NULL, g_hInst, NULL); { if ((contact->type == CLCIT_CONTACT && contact->pExtra->dwCFlags & ECF_RTLNICK) || (contact->type == CLCIT_GROUP && contact->isRtl)) { PARAFORMAT2 pf2; @@ -544,13 +544,13 @@ void BeginRenameSelection(HWND hwnd, struct ClcData *dat) pf2.cbSize = sizeof(pf2); pf2.dwMask = PFM_RTLPARA; pf2.wEffects = PFE_RTLPARA; - SetWindowText(dat->hwndRenameEdit, _T("")); + SetWindowText(dat->hwndRenameEdit, L""); SendMessage(dat->hwndRenameEdit, EM_SETPARAFORMAT, 0, (LPARAM)&pf2); SetWindowText(dat->hwndRenameEdit, contact->szText); } } - //dat->hwndRenameEdit = CreateWindow(_T("EDIT"), contact->szText, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, x, y, clRect.right - x, dat->rowHeight, hwnd, NULL, g_hInst, NULL); + //dat->hwndRenameEdit = CreateWindow(L"EDIT", contact->szText, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, x, y, clRect.right - x, dat->rowHeight, hwnd, NULL, g_hInst, NULL); mir_subclassWindow(dat->hwndRenameEdit, RenameEditSubclassProc); SendMessage(dat->hwndRenameEdit, WM_SETFONT, (WPARAM)(contact->type == CLCIT_GROUP ? dat->fontInfo[FONTID_GROUPS].hFont : dat->fontInfo[FONTID_CONTACTS].hFont), 0); SendMessage(dat->hwndRenameEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN | EC_USEFONTINFO, 0); @@ -575,7 +575,7 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) HFONT holdfont = (HFONT)SelectObject(hdc, dat->fontInfo[i].hFont); SIZE fontSize; - GetTextExtentPoint32(hdc, _T("x"), 1, &fontSize); + GetTextExtentPoint32(hdc, L"x", 1, &fontSize); SelectObject(hdc, holdfont); dat->fontInfo[i].fontHeight = fontSize.cy; diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index 506aa0ad49..34ec1b17dd 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -264,7 +264,7 @@ CListEvent* AddEvent(CLISTEVENT *cle) TCHAR szwProto[64]; MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64); szwProto[63] = 0; - mir_sntprintf(szBuffer, _T("%s: %s (%s)"), szwProto, szName, szStatus); + mir_sntprintf(szBuffer, L"%s: %s (%s)", szwProto, szName, szStatus); szBuffer[127] = 0; AppendMenu(cfg::dat.hMenuNotify, MF_BYCOMMAND | MF_STRING, cfg::dat.wNextMenuID, szBuffer); diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index a36112488e..7e74dbd6b2 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -67,14 +67,14 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA SendMessage(hWnd, WM_USER + 100, hContact, dwMask); SendMessage(hWnd, WM_USER + 120, 0, 0); TranslateDialogDefault(hWnd); - hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL); + hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, L"CLCButtonClass", L"FOO", WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL); CustomizeButton(hwndAdd, false, true, false); SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_ADDCONTACT)); SetWindowText(hwndAdd, TranslateT("Add permanently")); EnableWindow(hwndAdd, db_get_b(hContact, "CList", "NotOnList", 0)); - hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL); + hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, L"CLCButtonClass", L"FOO", WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL); CustomizeButton(hwndAdd, false, true, false); SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_DELETE)); diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 978601ef01..8041d1dda3 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -160,7 +160,7 @@ static int FS_FontsChanged(WPARAM, LPARAM) // last frame of all. static HWND PreCreateCLC(HWND parent) { - pcli->hwndContactTree = CreateWindow(_T(CLISTCONTROL_CLASS), _T(""), + pcli->hwndContactTree = CreateWindow(_T(CLISTCONTROL_CLASS), L"", WS_CHILD | CLS_CONTACTLIST | (db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) | (db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0) @@ -181,7 +181,7 @@ static int CreateCLC() { CLISTFrame frame = { 0 }; frame.cbSize = sizeof(frame); - frame.tname = _T("EventArea"); + frame.tname = L"EventArea"; frame.TBtname = TranslateT("Event area"); frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); frame.height = 20; @@ -201,7 +201,7 @@ static int CreateCLC() Frame.align = alClient; Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); Frame.Flags = F_VISIBLE | F_SHOWTB | F_SHOWTBTIP | F_NOBORDER | F_TCHAR; - Frame.tname = _T("My contacts"); + Frame.tname = L"My contacts"; Frame.TBtname = TranslateT("My contacts"); Frame.height = 200; hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0); @@ -256,7 +256,7 @@ static void InitIcoLib() char szBuffer[128]; mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE)); IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i }; - Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Overlay icons"), &icon, 1); + Icon_RegisterT(g_hInst, LPGENT("Contact list") L"/" LPGENT("Overlay icons"), &icon, 1); } PROTOACCOUNT **accs = NULL; @@ -269,7 +269,7 @@ static void InitIcoLib() TCHAR szDescr[128]; mir_sntprintf(szDescr, TranslateT("%s connecting"), accs[k]->tszAccountName); IconItemT icon = { szDescr, "conn", IDI_PROTOCONNECTING }; - Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName); + Icon_RegisterT(g_hInst, LPGENT("Contact list") L"/" LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName); } } @@ -281,14 +281,14 @@ static int IcoLibChanged(WPARAM, LPARAM) void CreateButtonBar(HWND hWnd) { - hTbMenu = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU)IDC_TBMENU, g_hInst, NULL); + hTbMenu = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU)IDC_TBMENU, g_hInst, NULL); CustomizeButton(hTbMenu, false, false, false); SetWindowText(hTbMenu, TranslateT("Menu")); SendMessage(hTbMenu, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_OTHER_MAINMENU)); SendMessage(hTbMenu, BUTTONSETSENDONDOWN, TRUE, 0); SendMessage(hTbMenu, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Open main menu"), 0); - hTbGlobalStatus = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU)IDC_TBGLOBALSTATUS, g_hInst, NULL); + hTbGlobalStatus = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU)IDC_TBGLOBALSTATUS, g_hInst, NULL); CustomizeButton(hTbGlobalStatus, false, false, false); SetWindowText(hTbGlobalStatus, TranslateT("Offline")); SendMessage(hTbGlobalStatus, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadIcon(SKINICON_STATUS_OFFLINE)); @@ -1716,7 +1716,7 @@ buttons_done: szName[0] = 0; if (mir_tstrlen(szName) < sizeof(szName) - 1) - mir_tstrcat(szName, _T(" ")); + mir_tstrcat(szName, L" "); GetTextExtentPoint32(dis->hDC, szName, (int)mir_tstrlen(szName), &textSize); TextOut(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - textSize.cy) >> 1, szName, (int)mir_tstrlen(szName)); x += textSize.cx; @@ -1827,7 +1827,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar { TCHAR str[64]; DWORD v = pluginInfo.version; - mir_sntprintf(str, _T("%s %d.%d.%d.%d"), TranslateT("Version"), HIBYTE(HIWORD(v)), LOBYTE(HIWORD(v)), HIBYTE(LOWORD(v)), LOBYTE(LOWORD(v))); + mir_sntprintf(str, L"%s %d.%d.%d.%d", TranslateT("Version"), HIBYTE(HIWORD(v)), LOBYTE(HIWORD(v)), HIBYTE(LOWORD(v)), LOBYTE(LOWORD(v))); SetDlgItemText(hwndDlg, IDC_VERSION, str); } { @@ -1924,7 +1924,7 @@ void LoadCLUIModule(void) wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)COLOR_3DFACE; wndclass.lpszMenuName = 0; - wndclass.lpszClassName = _T("EventAreaClass"); + wndclass.lpszClassName = L"EventAreaClass"; RegisterClass(&wndclass); oldhideoffline = db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT); diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 97f1884ad4..2a5fe5eca6 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -1014,7 +1014,7 @@ INT_PTR CLUIFramesShowHideFrame(WPARAM frameId, LPARAM) { mir_cslock lck(csFrameHook); pos = id2pos(frameId); - if (pos >= 0 && !mir_tstrcmp(Frames[pos].name, _T("My contacts"))) + if (pos >= 0 && !mir_tstrcmp(Frames[pos].name, L"My contacts")) Frames[pos].visible = 1; else { if (pos >= 0 && (int)pos < nFramescount) @@ -2318,7 +2318,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA hmenu = CreatePopupMenu(); AppendMenu(hmenu, MF_STRING | MF_DISABLED | MF_GRAYED, 15, Frames[framepos].name); - AppendMenu(hmenu, MF_SEPARATOR, 16, _T("")); + AppendMenu(hmenu, MF_SEPARATOR, 16, L""); if (Frames[framepos].Locked) AppendMenu(hmenu, MF_STRING | MF_CHECKED, frame_menu_lock, TranslateT("Lock frame")); @@ -2896,7 +2896,7 @@ TCHAR g_ptszEventName[100]; static int CLUIFrameOnModulesLoad(WPARAM, LPARAM) { - mir_sntprintf(g_ptszEventName, _T("mf_update_evt_%d"), GetCurrentThreadId()); + mir_sntprintf(g_ptszEventName, L"mf_update_evt_%d", GetCurrentThreadId()); g_hEventThread = CreateEvent(NULL, TRUE, FALSE, g_ptszEventName); hThreadMFUpdate = mir_forkthread(MF_UpdateThread, NULL); SetThreadPriority(hThreadMFUpdate, THREAD_PRIORITY_IDLE); @@ -2952,7 +2952,7 @@ int LoadCLUIFramesModule(void) cntclass.lpfnWndProc = CLUIFrameContainerWndProc; cntclass.hInstance = g_hInst; cntclass.hCursor = LoadCursor(NULL, IDC_ARROW); - cntclass.lpszClassName = _T("FramesContainer"); + cntclass.lpszClassName = L"FramesContainer"; RegisterClass(&cntclass); // create root menu diff --git a/plugins/Clist_nicer/src/cluiframes.h b/plugins/Clist_nicer/src/cluiframes.h index 4fef8cec0f..3f3d79687a 100644 --- a/plugins/Clist_nicer/src/cluiframes.h +++ b/plugins/Clist_nicer/src/cluiframes.h @@ -121,7 +121,7 @@ struct FRAMEWND #define OFFSET_PROTOPOS 200 #define OFFSET_VISIBLE 400 -#define CLUIFrameTitleBarClassName _T("CLUIFrameTitleBar") +#define CLUIFrameTitleBarClassName L"CLUIFrameTitleBar" #define CLUIFrameModule "CLUIFrames" #endif diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index f5257b8f0f..9a80fdd757 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -134,7 +134,7 @@ void CluiProtocolStatusChanged(int, const char*) mir_tstrncpy(szName, pa->tszAccountName, _countof(szName)); szName[_countof(szName) - 1] = 0; if ((showOpts & 4) && mir_tstrlen(szName) < sizeof(szName) - 1) - mir_tstrcat(szName, _T(" ")); + mir_tstrcat(szName, L" "); GetTextExtentPoint32(hdc, szName, (int)mir_tstrlen(szName), &textSize); x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room } diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 6347ce8874..4195d5fe63 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -42,7 +42,7 @@ EXCEPTION_RECORD API::exRecord = { 0 }; CONTEXT API::exCtx = { 0 }; LRESULT API::exLastResult = 0; char API::exSzFile[MAX_PATH] = ""; -TCHAR API::exReason[256] = _T(""); +TCHAR API::exReason[256] = L""; int API::exLine = 0; bool API::exAllowContinue = false; HMODULE API::hDwm = 0; @@ -99,7 +99,7 @@ void API::onInit() sysConfig.isSevenPlus = (IsWinVer7Plus() ? true : false); if (sysConfig.isVistaPlus) { - if ((hDwm = Utils::loadSystemLibrary(_T("\\dwmapi.dll")), true) != 0) { + if ((hDwm = Utils::loadSystemLibrary(L"\\dwmapi.dll"), true) != 0) { pfnDwmIsCompositionEnabled = (pfnDwmIsCompositionEnabled_t)GetProcAddress(hDwm, "DwmIsCompositionEnabled"); pfnDwmExtendFrameIntoClientArea = (pfnDwmExtendFrameIntoClientArea_t)GetProcAddress(hDwm, "DwmExtendFrameIntoClientArea"); } @@ -202,7 +202,7 @@ int API::Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, TCH memcpy(&exCtx, ep->ContextRecord, sizeof(CONTEXT)); mir_snprintf(exSzFile, "%s%s", szName, szExt); - mir_sntprintf(exReason, _T("An application error has occured: %s"), szReason); + mir_sntprintf(exReason, L"An application error has occured: %s", szReason); exLine = line; exLastResult = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_EXCEPTION), 0, Ex_DlgProc, 0); exAllowContinue = fAllowContinue; @@ -268,7 +268,7 @@ void CRTException::display() const TCHAR *tszMsg = mir_a2t(what()); TCHAR tszBoxMsg[500]; - mir_sntprintf(tszBoxMsg, _T("%s\n\n(%s)"), tszMsg, m_szParam); - ::MessageBox(0, tszBoxMsg, _T("Clist_nicer runtime error"), MB_OK | MB_ICONERROR); + mir_sntprintf(tszBoxMsg, L"%s\n\n(%s)", tszMsg, m_szParam); + ::MessageBox(0, tszBoxMsg, L"Clist_nicer runtime error", MB_OK | MB_ICONERROR); mir_free(tszMsg); } diff --git a/plugins/Clist_nicer/src/coolsblib.cpp b/plugins/Clist_nicer/src/coolsblib.cpp index bf4e14421d..3dc6705d9a 100644 --- a/plugins/Clist_nicer/src/coolsblib.cpp +++ b/plugins/Clist_nicer/src/coolsblib.cpp @@ -31,7 +31,7 @@ #include "userdefs.h" #include "coolsb_internal.h" -static TCHAR szPropStr[] = _T("CoolSBSubclassPtr"); +static TCHAR szPropStr[] = L"CoolSBSubclassPtr"; LRESULT CALLBACK CoolSBWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); @@ -234,7 +234,7 @@ BOOL WINAPI InitializeCoolSB(HWND hwnd) ice.dwICC = ICC_BAR_CLASSES; InitCommonControlsEx(&ice); - sw->hwndToolTip = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, TOOLTIPS_CLASS, _T(""), + sw->hwndToolTip = CreateWindowEx(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, TOOLTIPS_CLASS, L"", WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 70e9cfedaf..325330056c 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -1152,7 +1152,7 @@ static void BTN_ReadItem(char *itemName, char *file) newItem->nextItem = 0; curItem->nextItem = newItem; } - newItem->hWnd = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 5, 5, pcli->hwndContactList, (HMENU)newItem->uId, g_hInst, NULL); + newItem->hWnd = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 5, 5, pcli->hwndContactList, (HMENU)newItem->uId, g_hInst, NULL); CustomizeButton(newItem->hWnd, false, false, true); SendMessage(newItem->hWnd, BUTTONSETBTNITEM, 0, (LPARAM)newItem); if (newItem->dwFlags & BUTTON_ISTOGGLE) @@ -1501,7 +1501,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L db_free(&dbv); } else - SetDlgItemText(hwndDlg, IDC_SKINFILENAME, _T("")); + SetDlgItemText(hwndDlg, IDC_SKINFILENAME, L""); return TRUE; } case WM_COMMAND: @@ -1524,17 +1524,17 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L case IDC_SELECTSKINFILE: { OPENFILENAME ofn = { 0 }; - TCHAR str[MAX_PATH] = _T("*.clist"), final_path[MAX_PATH]; + TCHAR str[MAX_PATH] = L"*.clist", final_path[MAX_PATH]; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; ofn.hwndOwner = hwndDlg; ofn.hInstance = NULL; - ofn.lpstrFilter = _T("*.clist\0"); + ofn.lpstrFilter = L"*.clist\0"; ofn.lpstrFile = str; ofn.Flags = OFN_FILEMUSTEXIST | OFN_DONTADDTORECENT; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; - ofn.lpstrDefExt = _T(""); + ofn.lpstrDefExt = L""; if (!GetOpenFileName(&ofn)) break; MY_pathToRelative(str, final_path); diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index 91ea967a2f..8f127b3bd0 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -160,8 +160,8 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM BYTE isLocked = db_get_b(NULL, PD->RealName, "LockMainStatus", 0); TCHAR szTipText[256]; - mir_sntprintf(szTipText, _T("%s: %s%s"), - PD->RealName, pcli->pfnGetStatusModeDescription(wStatus, 0), isLocked ? _T(" (LOCKED)") : _T("")); + mir_sntprintf(szTipText, L"%s: %s%s", + PD->RealName, pcli->pfnGetStatusModeDescription(wStatus, 0), isLocked ? L" (LOCKED)" : L""); CLCINFOTIP ti = { sizeof(ti) }; ti.isTreeFocused = (GetFocus() == pcli->hwndContactList); diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index f13f1f6eb7..c684d6dc0c 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -320,7 +320,7 @@ void SaveViewMode(const char *name, const TCHAR *szGroupFilter, const char *szPr // saves the state of the filter definitions for the current item void SaveState() { - CMString newGroupFilter(_T("|")); + CMString newGroupFilter(L"|"); CMStringA newProtoFilter("|"); DWORD statusMask = 0; DWORD operators = 0; @@ -493,7 +493,7 @@ void UpdateFilters() for (int i = 1; i < ListView_GetItemCount(hwndList); i++) { item.iItem = i; SendMessage(hwndList, LVM_GETITEM, 0, (LPARAM)&item); - mir_sntprintf(szMask, _T("%s|"), szTemp); + mir_sntprintf(szMask, L"%s|", szTemp); if (dbv_gf.ptszVal && _tcsstr(dbv_gf.ptszVal, szMask)) { ListView_SetCheckState(hwndList, i, TRUE); } @@ -687,7 +687,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP int iNewItem = SendDlgItemMessageA(hwndDlg, IDC_VIEWMODES, LB_INSERTSTRING, -1, (LPARAM)szBuf); if (iNewItem != LB_ERR) { SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, (WPARAM)iNewItem, 0); - SaveViewMode(szBuf, _T(""), "", -1, -1, 0, 0, 0, 0); + SaveViewMode(szBuf, L"", "", -1, -1, 0, 0, 0, 0); sttClvm_curItem = iNewItem; UpdateStickies(); SendDlgItemMessage(hwndDlg, IDC_PROTOGROUPOP, CB_SETCURSEL, 0, 0); @@ -825,18 +825,18 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM { switch (msg) { case WM_CREATE: - hwndSelector = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, + hwndSelector = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hwnd, (HMENU)IDC_SELECTMODE, g_hInst, NULL); CustomizeButton(hwndSelector, false, false, false); SendMessage(hwndSelector, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Select a view mode"), BATF_UNICODE); SendMessage(hwndSelector, BUTTONSETSENDONDOWN, TRUE, 0); { - HWND hwndButton = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, + HWND hwndButton = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hwnd, (HMENU)IDC_CONFIGUREMODES, g_hInst, NULL); CustomizeButton(hwndButton, false, false, false); SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Setup view modes"), BATF_UNICODE); - hwndButton = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, + hwndButton = CreateWindowEx(0, MIRANDABUTTONCLASS, L"", BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hwnd, (HMENU)IDC_RESETMODES, g_hInst, NULL); CustomizeButton(hwndButton, false, false, false); SendMessage(hwndButton, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Clear view mode and return to default display"), BATF_UNICODE); @@ -1010,18 +1010,18 @@ void CreateViewModeFrame() wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_3DFACE); wndclass.lpszMenuName = 0; - wndclass.lpszClassName = _T("CLVMFrameWindow"); + wndclass.lpszClassName = L"CLVMFrameWindow"; RegisterClass(&wndclass); memset(&frame, 0, sizeof(frame)); frame.cbSize = sizeof(frame); - frame.tname = _T("View modes"); + frame.tname = L"View modes"; frame.TBtname = TranslateT("View modes"); frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); frame.height = 22; frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_TCHAR; frame.align = alBottom; - frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T("CLVM"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL); + frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", L"CLVM", WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL); g_hwndViewModeFrame = frame.hWnd; hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0); CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS); -- cgit v1.2.3