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

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index ce5b1da030..676ac0beab 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -237,7 +237,7 @@ INT_PTR Popup_ShowMessageW(WPARAM wParam, LPARAM lParam)
 	POPUPDATA2 ppd2 = { 0 };

 	ppd2.cbSize = sizeof(ppd2);

 	ppd2.flags = PU2_UNICODE;

-	ppd2.lptzText = (TCHAR*)wParam;

+	ppd2.lptzText = (wchar_t*)wParam;

 	switch (lParam & 0x7fffffff) {

 	case SM_ERROR:

 		ppd2.lchIcon = LoadIconEx(IDI_MB_STOP, 0);

@@ -381,13 +381,13 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam)
 	ptd->pupClass.colorText = (COLORREF)db_get_dw(NULL, PU_MODULCLASS, setting, fonts.clText/*pc->colorText*/);

 	FontIDT fid = { 0 };

 	fid.cbSize = sizeof(FontIDT);

-	mir_sntprintf(fid.group, _T(PU_FNT_AND_COLOR)L"/%S", ptd->pupClass.pszName);

+	mir_sntprintf(fid.group, _A2W(PU_FNT_AND_COLOR) L"/%S", ptd->pupClass.pszName);

 	mir_strncpy(fid.dbSettingsGroup, PU_MODULCLASS, _countof(fid.dbSettingsGroup) - 1);

 	fid.flags = FIDF_DEFAULTVALID;

 	fid.deffontsettings.charset = DEFAULT_CHARSET;

 	fid.deffontsettings.size = -11;

 	mir_tstrncpy(fid.deffontsettings.szFace, L"Verdana", _countof(fid.deffontsettings.szFace) - 1);

-	mir_tstrncpy(fid.name, _T(PU_FNT_NAME_TEXT), _countof(fid.name) - 1);

+	mir_tstrncpy(fid.name, PU_FNT_NAME_TEXT, _countof(fid.name) - 1);

 	mir_strncpy(fid.prefix, setting, _countof(fid.prefix));

 	mir_snprintf(fid.prefix, "%s/Text", ptd->pupClass.pszName);  // result is "%s/TextCol"

 	fid.deffontsettings.style = 0;

@@ -399,7 +399,7 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam)
 	ptd->pupClass.colorBack = (COLORREF)db_get_dw(NULL, PU_MODULCLASS, setting, (DWORD)fonts.clBack/*pc->colorBack*/);

 	ColourIDT cid = { 0 };

 	cid.cbSize = sizeof(ColourIDT);

-	mir_sntprintf(cid.group, _T(PU_FNT_AND_COLOR)L"/%S", ptd->pupClass.pszName);

+	mir_sntprintf(cid.group, _A2W(PU_FNT_AND_COLOR) L"/%S", ptd->pupClass.pszName);

 	mir_strncpy(cid.dbSettingsGroup, PU_MODULCLASS, _countof(fid.dbSettingsGroup));

 	mir_tstrncpy(cid.name, PU_COL_BACK_NAME, _countof(cid.name));

 	mir_snprintf(cid.setting, "%s/BgCol", ptd->pupClass.pszName);

@@ -457,8 +457,8 @@ INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam)
 	ppd2.PluginWindowProc = pc->PluginWindowProc;

 	if (pc->flags & PCF_UNICODE) {

 		ppd2.flags = PU2_UNICODE;

-		ppd2.lptzTitle = (TCHAR*)pdc->ptszTitle;

-		ppd2.lptzText = (TCHAR*)pdc->ptszText;

+		ppd2.lptzTitle = (wchar_t*)pdc->pwszTitle;

+		ppd2.lptzText = (wchar_t*)pdc->pwszText;

 	}

 	else {

 		ppd2.flags = PU2_ANSI;