From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/HistoryStats/src/dlgoption_subglobal.cpp') diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index d04db4d390..ec6c21ae94 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -94,10 +94,10 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA if (HIWORD(wParam) == STN_CLICKED) { HWND hLink = reinterpret_cast(lParam); int nLen = GetWindowTextLength(hLink); - TCHAR* szTitle = new TCHAR[nLen + 1]; + wchar_t* szTitle = new wchar_t[nLen + 1]; if (GetWindowText(hLink, szTitle, nLen + 1)) { - TCHAR* szEndOfURL = (TCHAR*)ext::strfunc::str(szTitle, L" ["); + wchar_t* szEndOfURL = (wchar_t*)ext::strfunc::str(szTitle, L" ["); if (szEndOfURL) { *szEndOfURL = '\0'; g_pSettings->openURL(szTitle); @@ -112,7 +112,7 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA case WM_CTLCOLORSTATIC: HWND hStatic = reinterpret_cast(lParam); - TCHAR szClassName[64]; + wchar_t szClassName[64]; if (GetClassName(hStatic, szClassName, _countof(szClassName)) && ext::strfunc::cmp(szClassName, WC_EDIT) == 0) { HDC hDC = reinterpret_cast(wParam); @@ -313,9 +313,9 @@ void DlgOption::SubGlobal::initSupportInfo() static const SupportInfo Infos[] = { { TranslateT("At this time there is no external plugin supported."), - LPGENT(""), - LPGENT(""), - LPGENT(""), + LPGENW(""), + LPGENW(""), + LPGENW(""), L"" }, }; @@ -335,14 +335,14 @@ void DlgOption::SubGlobal::initSupportInfo() tvi.item.state = TVIS_EXPANDED | TVIS_BOLD; tvi.item.stateMask = TVIS_EXPANDED | TVIS_BOLD; - tvi.item.pszText = const_cast(TranslateT("Supported plugins (double-click to learn more):")); + tvi.item.pszText = const_cast(TranslateT("Supported plugins (double-click to learn more):")); tvi.hParent = TreeView_InsertItem(hInfo, &tvi); tvi.item.stateMask &= ~TVIS_BOLD; array_each_(i, Infos) { - tvi.item.pszText = const_cast(Infos[i].szPlugin); + tvi.item.pszText = const_cast(Infos[i].szPlugin); tvi.item.lParam = reinterpret_cast(&Infos[i]); TreeView_InsertItem(hInfo, &tvi); } @@ -385,7 +385,7 @@ void DlgOption::SubGlobal::rearrangeControls() void DlgOption::SubGlobal::toggleInfo() { HWND hInfo = GetDlgItem(getHWnd(), IDC_INFO); - const TCHAR* szInfoLabelText = m_bShowInfo ? LPGENT("HistoryStats supports several plugins. Click to hide info...") : LPGENT("HistoryStats supports several plugins. Click to learn more..."); + const wchar_t* szInfoLabelText = m_bShowInfo ? LPGENW("HistoryStats supports several plugins. Click to hide info...") : LPGENW("HistoryStats supports several plugins. Click to learn more..."); SetDlgItemText(getHWnd(), IDC_INFOLABEL, TranslateTS(szInfoLabelText)); ShowWindow(hInfo, m_bShowInfo ? SW_SHOW : SW_HIDE); -- cgit v1.2.3