From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Popup/src/main.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/Popup/src/main.cpp')

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 39e20dae06..ff38a8977a 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -148,14 +148,14 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM)
 		// The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item.
 		PopupOptions.ModuleIsEnabled = FALSE;
 		db_set_b(NULL, "Popup", "ModuleIsEnabled", FALSE);
-		Menu_ModifyItem(hMenuItem, LPGENT("Enable Popups"), hIcon = GetIconHandle(IDI_NOPOPUP));
+		Menu_ModifyItem(hMenuItem, LPGENW("Enable Popups"), hIcon = GetIconHandle(IDI_NOPOPUP));
 	}
 	else {
 		// The module is disabled.
 		// The action to do is enable popups (show enabled), then write "disable popup" in the new item.
 		PopupOptions.ModuleIsEnabled = TRUE;
 		db_set_b(NULL, "Popup", "ModuleIsEnabled", TRUE);
-		Menu_ModifyItem(hMenuItem, LPGENT("Disable Popups"), hIcon = GetIconHandle(IDI_POPUP));
+		Menu_ModifyItem(hMenuItem, LPGENW("Disable Popups"), hIcon = GetIconHandle(IDI_POPUP));
 	}
 
 	Menu_ModifyItem(hMenuRoot, NULL, hIcon);
@@ -180,14 +180,14 @@ void InitMenuItems(void)
 	HANDLE hIcon = GetIconHandle(PopupOptions.ModuleIsEnabled ? IDI_POPUP : IDI_NOPOPUP);
 
 	// Build main menu
-	hMenuRoot = mi.root = Menu_CreateRoot(MO_MAIN, LPGENT(MODULNAME_PLU), -1000000000, hIcon);
+	hMenuRoot = mi.root = Menu_CreateRoot(MO_MAIN, MODULNAME_PLUW, -1000000000, hIcon);
 	Menu_ConfigureItem(mi.root, MCI_OPT_UID, "3F5B5AB5-46D8-469E-8951-50B287C59037");
 
 	// Add item to main menu
 	SET_UID(mi, 0x4353d44e, 0x177, 0x4843, 0x88, 0x30, 0x25, 0x5d, 0x91, 0xad, 0xdf, 0x3f);
 	mi.pszService = MENUCOMMAND_SVC;
 	CreateServiceFunction(mi.pszService, svcEnableDisableMenuCommand);
-	mi.name.t = PopupOptions.ModuleIsEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups");
+	mi.name.w = PopupOptions.ModuleIsEnabled ? LPGENW("Disable Popups") : LPGENW("Enable Popups");
 	mi.hIcolibItem = hIcon;
 	hMenuItem = Menu_AddMainMenuItem(&mi);
 
@@ -196,7 +196,7 @@ void InitMenuItems(void)
 	mi.pszService = MENUCOMMAND_HISTORY;
 	CreateServiceFunction(mi.pszService, svcShowHistory);
 	mi.position = 1000000000;
-	mi.name.t = LPGENT("Popup History");
+	mi.name.w = LPGENW("Popup History");
 	mi.hIcolibItem = GetIconHandle(IDI_HISTORY);
 	hMenuItemHistory = Menu_AddMainMenuItem(&mi);
 }
@@ -213,14 +213,14 @@ void LoadHotkey()
 	HOTKEYDESC hk = { sizeof(hk) };
 	hk.dwFlags = HKD_TCHAR;
 	hk.pszName = "Toggle Popups";
-	hk.ptszDescription = LPGENT("Toggle Popups");
-	hk.ptszSection = LPGENT(MODULNAME_PLU);
+	hk.ptszDescription = LPGENW("Toggle Popups");
+	hk.ptszSection = MODULNAME_PLUW;
 	hk.pszService = MENUCOMMAND_SVC;
 	Hotkey_Register(&hk);
 
 	// 'Popup History' Hotkey
 	hk.pszName = "Popup History";
-	hk.ptszDescription = LPGENT("Popup History");
+	hk.ptszDescription = LPGENW("Popup History");
 	hk.pszService = MENUCOMMAND_HISTORY;
 	Hotkey_Register(&hk);
 }
@@ -339,7 +339,7 @@ MIRAPI int Load(void)
 	PopupHistoryLoad();
 	LoadPopupThread();
 	if (!LoadPopupWnd2()) {
-		MessageBox(0, TranslateT("Error: I could not register the Popup Window class.\r\nThe plugin will not operate."), _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK);
+		MessageBox(0, TranslateT("Error: I could not register the Popup Window class.\r\nThe plugin will not operate."), MODULNAME_LONG, MB_ICONSTOP | MB_OK);
 		return 0; // We couldn't register our Window Class, don't hook any event: the plugin will act as if it was disabled.
 	}
 	RegisterOptPrevBox();
-- 
cgit v1.2.3