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/StartupSilence/src/main.cpp | 8 ++++---- plugins/StartupSilence/src/stdafx.h | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'plugins/StartupSilence/src') diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index abe47b5afb..b6e0a330f9 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -227,7 +227,7 @@ static INT_PTR AdvSt() if ((Enabled == 1)) { POPUPDATAT ppd = {0}; - TCHAR * lptzText =L""; + wchar_t * lptzText =L""; db_set_b(NULL, "Skin", "UseSound", 0); EnablePopupModule(); @@ -237,7 +237,7 @@ static INT_PTR AdvSt() ppd.lchContact = NULL; ppd.iSeconds = PopUpTime; wcsncpy_s(ppd.lptzText, lptzText, _TRUNCATE); - lptzText = TranslateT(MENU_NAME); + lptzText = TranslateW(MENU_NAMEW); wcsncpy_s(ppd.lptzContactName, lptzText, _TRUNCATE); PUAddPopupT(&ppd); } @@ -267,13 +267,13 @@ INT_PTR StartupSilenceEnabled(WPARAM, LPARAM) if (MenuItem == 1) UpdateMenu(); if (PopUp == 1) { - TCHAR * lptzText = Enabled == 1 ? S_MODE_CHANGEDON : S_MODE_CHANGEDOFF; + wchar_t * lptzText = Enabled == 1 ? S_MODE_CHANGEDON : S_MODE_CHANGEDOFF; POPUPDATAT ppd = {0}; ppd.lchIcon = IcoLib_GetIconByHandle((Enabled == 1) ? GetIconHandle(ENABLE_SILENCE) : GetIconHandle(DISABLE_SILENCE)); ppd.lchContact = NULL; ppd.iSeconds = PopUpTime; wcsncpy_s(ppd.lptzText, lptzText, _TRUNCATE); - lptzText = TranslateT(MENU_NAME); + lptzText = TranslateW(MENU_NAMEW); wcsncpy_s(ppd.lptzContactName, lptzText, _TRUNCATE); PUAddPopupT(&ppd); } diff --git a/plugins/StartupSilence/src/stdafx.h b/plugins/StartupSilence/src/stdafx.h index 84ca37766e..e4fcc25b3b 100644 --- a/plugins/StartupSilence/src/stdafx.h +++ b/plugins/StartupSilence/src/stdafx.h @@ -45,6 +45,7 @@ INT_PTR SilenceConnection(WPARAM wParam, LPARAM lParam); #define SS_SILENCE_CONNECTION "StartupSilence/SilenceConnection" #define MENU_NAME LPGEN("Silence at startup") +#define MENU_NAMEW LPGENW("Silence at startup") #define DISABLE_SILENCE LPGEN("Toggle Silence OFF") #define ENABLE_SILENCE LPGEN("Toggle Silence ON") #define DISABLE_SILENCETTB LPGEN("Toggle Silence OFF TTB") @@ -58,15 +59,15 @@ INT_PTR SilenceConnection(WPARAM wParam, LPARAM lParam); #define SS_IS_ON Translate("Silence At Startup is ON") #define SS_IS_OFF Translate("Silence At Startup is OFF") #define TTBNAME Translate("Toggle Silence At Startup") -#define NOTICE TranslateT(MENU_NAME) +#define NOTICE TranslateW(MENU_NAMEW) #define NEEDTTBMOD TranslateT("You have to install TopToolBar plugin to use this option.") #define NEEDPOPUP TranslateT("You have to install popup plugin to use this option.") static IconItem iconList[] = { - {MENU_NAME, MENU_NAME, IDI_SSICON}, - {ALL_ENABLED_FLT, ALL_ENABLED_FLT, IDI_SSFILTEREDON}, - {DISABLE_SILENCE, DISABLE_SILENCE, IDI_SSDISABLE}, - {ENABLE_SILENCE, ENABLE_SILENCE, IDI_SSENABLE} + { MENU_NAME, MENU_NAME, IDI_SSICON}, + { ALL_ENABLED_FLT, ALL_ENABLED_FLT, IDI_SSFILTEREDON}, + { DISABLE_SILENCE, DISABLE_SILENCE, IDI_SSDISABLE}, + { ENABLE_SILENCE, ENABLE_SILENCE, IDI_SSENABLE} }; static IconItem iconttbList[] = { -- cgit v1.2.3