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/Toaster/src/options.cpp | 4 ++-- plugins/Toaster/src/structs.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Toaster') diff --git a/plugins/Toaster/src/options.cpp b/plugins/Toaster/src/options.cpp index d023d19d67..0dcfe12f64 100644 --- a/plugins/Toaster/src/options.cpp +++ b/plugins/Toaster/src/options.cpp @@ -46,10 +46,10 @@ void COptions::Enabled_OnChange(CCtrlCheck* chk) int OnOptionsInitialized(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; - odp.ptszTitle = L"Popups"; //_T(MODULE); + odp.pwszTitle = L"Popups"; //_T(MODULE); odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.position = -790000000; - odp.ptszTab = _T(MODULE); + odp.pwszTab = _T(MODULE); odp.pDialog = new COptions(); Options_AddPage(wParam, &odp); diff --git a/plugins/Toaster/src/structs.h b/plugins/Toaster/src/structs.h index d304141f2f..fe8a658850 100644 --- a/plugins/Toaster/src/structs.h +++ b/plugins/Toaster/src/structs.h @@ -3,8 +3,8 @@ struct ToastData : public MZeroedObject { MCONTACT hContact; - TCHAR *tszTitle; - TCHAR *tszText; + wchar_t *tszTitle; + wchar_t *tszText; union { HICON hIcon; @@ -15,7 +15,7 @@ struct ToastData : public MZeroedObject WNDPROC pPopupProc; void *vPopupData; - ToastData(MCONTACT _hContact, const TCHAR *_tszTitle, const TCHAR *_tszText, HICON _hIcon = NULL) : + ToastData(MCONTACT _hContact, const wchar_t *_tszTitle, const wchar_t *_tszText, HICON _hIcon = NULL) : hContact(_hContact), tszTitle(mir_tstrdup(_tszTitle)), tszText(mir_tstrdup(_tszText)), @@ -24,7 +24,7 @@ struct ToastData : public MZeroedObject pPopupProc(NULL), vPopupData(NULL) {} - ToastData(MCONTACT _hContact, const TCHAR *_tszTitle, const TCHAR *_tszText, HBITMAP bmp = NULL) : + ToastData(MCONTACT _hContact, const wchar_t *_tszTitle, const wchar_t *_tszText, HBITMAP bmp = NULL) : hContact(_hContact), tszTitle(mir_tstrdup(_tszTitle)), tszText(mir_tstrdup(_tszText)), -- cgit v1.2.3