Tera TermRevision: 9358
https://osdn.net/projects/ttssh2/scm/svn/commits/9358
Author: zmatsuo
Date: 2021-08-14 12:26:18 +0900 (Sat, 14 Aug 2021)
Log Message:
-----------
ポップアップメニューを Unicode化
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2021-08-14 03:26:08 UTC (rev 9357)
+++ trunk/teraterm/teraterm/vtwin.cpp 2021-08-14 03:26:18 UTC (rev 9358)
@@ -548,7 +548,6 @@
if ((LMR==IdLeftButton) && ControlKey() && (MainMenu==NULL) &&
((ts.MenuFlag & MF_NOPOPUP)==0)) {
int i, numItems;
- char itemText[256];
InitMenu(&PopupMenu);
@@ -556,6 +555,7 @@
numItems = GetMenuItemCount(PopupMenu);
for (i = 0; i < numItems; i++) {
+ wchar_t itemText[256];
HMENU submenu = GetSubMenu(PopupMenu, i);
if (submenu != NULL) {
@@ -562,15 +562,15 @@
InitMenuPopup(submenu);
}
- if (GetMenuString(PopupMenu, i, itemText, sizeof(itemText), MF_BYPOSITION) != 0) {
+ if (GetMenuStringW(PopupMenu, i, itemText, _countof(itemText), MF_BYPOSITION) != 0) {
int state = GetMenuState(PopupMenu, i, MF_BYPOSITION) &
(MF_CHECKED | MF_DISABLED | MF_GRAYED | MF_HILITE |
MF_MENUBARBREAK | MF_MENUBREAK | MF_SEPARATOR);
- AppendMenu(PopupBase,
- submenu != NULL ? LOBYTE(state) | MF_POPUP : state,
- submenu != NULL ? (UINT_PTR)submenu : GetMenuItemID(PopupMenu, i),
- itemText);
+ AppendMenuW(PopupBase,
+ submenu != NULL ? LOBYTE(state) | MF_POPUP : state,
+ submenu != NULL ? (UINT_PTR)submenu : GetMenuItemID(PopupMenu, i),
+ itemText);
}
}
@@ -605,7 +605,6 @@
IsClipboardFormatAvailable(CF_OEMTEXT))) {
int i, numItems;
- char itemText[256];
InitPasteMenu(&PopupMenu);
PopupBase = CreatePopupMenu();
@@ -612,13 +611,14 @@
numItems = GetMenuItemCount(PopupMenu);
for (i = 0; i < numItems; i++) {
- if (GetMenuString(PopupMenu, i, itemText, sizeof(itemText), MF_BYPOSITION) != 0) {
+ wchar_t itemText[256];
+ if (GetMenuStringW(PopupMenu, i, itemText, _countof(itemText), MF_BYPOSITION) != 0) {
int state = GetMenuState(PopupMenu, i, MF_BYPOSITION) &
(MF_CHECKED | MF_DISABLED | MF_GRAYED | MF_HILITE |
MF_MENUBARBREAK | MF_MENUBREAK | MF_SEPARATOR);
- AppendMenu(PopupBase, state,
- GetMenuItemID(PopupMenu, i), itemText);
+ AppendMenuW(PopupBase, state,
+ GetMenuItemID(PopupMenu, i), itemText);
}
}