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/UserInfoEx/src/dlg_msgbox.cpp | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'plugins/UserInfoEx/src/dlg_msgbox.cpp') diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 8cb11462e3..a3b3444e43 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -322,9 +322,9 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_OKCANCEL: retOk = IDRETRY; - SetDlgItemText(hDlg, IDOK, LPGENT("OK")); + SetDlgItemText(hDlg, IDOK, LPGENW("OK")); retCancel = IDCANCEL; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("Cancel")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("Cancel")); rcOk.left = dlgMid - okWidth - 10; rcOk.right = rcOk.left + okWidth; rcCancel.left = dlgMid + 10; @@ -335,9 +335,9 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_RETRYCANCEL: retOk = IDRETRY; - SetDlgItemText(hDlg, IDOK, LPGENT("Retry")); + SetDlgItemText(hDlg, IDOK, LPGENW("Retry")); retCancel = IDCANCEL; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("Cancel")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("Cancel")); rcOk.left = dlgMid - okWidth - 10; rcOk.right = rcOk.left + okWidth; rcCancel.left = dlgMid + 10; @@ -348,9 +348,9 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_YESNO: retOk = IDYES; - SetDlgItemText(hDlg, IDOK, LPGENT("Yes")); + SetDlgItemText(hDlg, IDOK, LPGENW("Yes")); retCancel = IDNO; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("No")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("No")); rcOk.left = dlgMid - okWidth - 10; rcOk.right = rcOk.left + okWidth; rcCancel.left = dlgMid + 10; @@ -361,11 +361,11 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_ABORTRETRYIGNORE: retOk = IDABORT; - SetDlgItemText(hDlg, IDOK, LPGENT("Abort")); + SetDlgItemText(hDlg, IDOK, LPGENW("Abort")); retAll = IDABORT; - SetDlgItemText(hDlg, IDALL, LPGENT("Retry")); + SetDlgItemText(hDlg, IDALL, LPGENW("Retry")); retCancel = IDCANCEL; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("Ignore")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("Ignore")); rcAll.left = dlgMid - (allWidth / 2); rcAll.right = rcAll.left + allWidth; rcOk.left = rcAll.left - okWidth - 5; @@ -379,11 +379,11 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_YESNOCANCEL: retOk = IDYES; - SetDlgItemText(hDlg, IDOK, LPGENT("Yes")); + SetDlgItemText(hDlg, IDOK, LPGENW("Yes")); retAll = IDNO; - SetDlgItemText(hDlg, IDALL, LPGENT("No")); + SetDlgItemText(hDlg, IDALL, LPGENW("No")); retCancel = IDCANCEL; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("Cancel")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("Cancel")); rcAll.left = dlgMid - (allWidth / 2); rcAll.right = rcAll.left + allWidth; rcOk.left = rcAll.left - okWidth - 5; @@ -397,13 +397,13 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l case MB_YESALLNO: retOk = IDYES; - SetDlgItemText(hDlg, IDOK, LPGENT("Yes")); + SetDlgItemText(hDlg, IDOK, LPGENW("Yes")); retAll = IDALL; - SetDlgItemText(hDlg, IDALL, LPGENT("All")); + SetDlgItemText(hDlg, IDALL, LPGENW("All")); //retNon = IDNONE; - SetDlgItemText(hDlg, IDNONE, LPGENT("None")); + SetDlgItemText(hDlg, IDNONE, LPGENW("None")); retCancel = IDNO; - SetDlgItemText(hDlg, IDCANCEL, LPGENT("No")); + SetDlgItemText(hDlg, IDCANCEL, LPGENW("No")); rcCancel.right = rcDlg.right - rcDlg.left - 10; rcCancel.left = rcCancel.right - caWidth; rcNone.right = rcCancel.left - 5; @@ -660,7 +660,7 @@ INT_PTR MsgBoxService(WPARAM, LPARAM lParam) **/ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszInfo, LPCTSTR pszFormat, ...) { - TCHAR tszMsg[MAX_SECONDLINE]; + wchar_t tszMsg[MAX_SECONDLINE]; va_list vl; va_start(vl, pszFormat); @@ -686,7 +686,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI **/ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...) { - TCHAR tszTitle[MAX_SECONDLINE], tszMsg[MAX_SECONDLINE]; + wchar_t tszTitle[MAX_SECONDLINE], tszMsg[MAX_SECONDLINE]; mir_sntprintf(tszTitle, L"%s - %s", _T(MODNAME), TranslateT("Error")); va_list vl; -- cgit v1.2.3