• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8246 (tree)
Time2019-10-03 00:07:09
Authorzmatsuo

Log Message

SetI18MenuStrs() でUnicode版APIを使うようにした

- 使えない場合ANSI版APIを使用する(9xの場合)
- VTWinのメニューがいつでも言語変更できるようになった

Change Summary

Incremental Difference

--- branches/unicode_buf/teraterm/common/compat_win.cpp (revision 8245)
+++ branches/unicode_buf/teraterm/common/compat_win.cpp (revision 8246)
@@ -34,6 +34,7 @@
3434
3535 #include "dllutil.h"
3636
37+BOOL (WINAPI *pModifyMenuW)(HMENU hMnu, UINT uPosition, UINT uFlags, UINT_PTR uIDNewItem, LPCWSTR lpNewItem);
3738 BOOL (WINAPI *pSetWindowTextW)(HWND hWnd, LPCWSTR lpString);
3839 DWORD (WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault, LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
3940 UINT (WINAPI *pDragQueryFileW)(HDROP hDrop, UINT iFile, LPWSTR lpszFile, UINT cch);
@@ -62,6 +63,7 @@
6263 { "AdjustWindowRectExForDpi", (void **)&pAdjustWindowRectExForDpi },
6364 { "SetDlgItemTextW", (void **)&pSetDlgItemTextW },
6465 { "SetWindowTextW", (void **)&pSetWindowTextW },
66+ { "ModifyMenuW", (void **)&pModifyMenuW },
6567 { NULL, NULL },
6668 };
6769
--- branches/unicode_buf/teraterm/common/compat_win.h (revision 8245)
+++ branches/unicode_buf/teraterm/common/compat_win.h (revision 8246)
@@ -67,6 +67,7 @@
6767 #define OPENFILENAME_SIZE_VERSION_400A 76
6868 #endif
6969
70+extern BOOL(WINAPI *pModifyMenuW)(HMENU hMnu, UINT uPosition, UINT uFlags, UINT_PTR uIDNewItem, LPCWSTR lpNewItem);
7071 extern BOOL(WINAPI *pSetWindowTextW)(HWND hWnd, LPCWSTR lpString);
7172 extern DWORD(WINAPI *pGetPrivateProfileStringW)(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpDefault,
7273 LPWSTR lpReturnedString, DWORD nSize, LPCWSTR lpFileName);
--- branches/unicode_buf/teraterm/common/i18n.c (revision 8245)
+++ branches/unicode_buf/teraterm/common/i18n.c (revision 8246)
@@ -127,10 +127,10 @@
127127 size_t i;
128128 assert(hDlgWnd != NULL);
129129 assert(infoCount > 0);
130- if (pGetPrivateProfileStringW == NULL) {
131- // ANSI
132- for (i = 0 ; i < infoCount; i++) {
133- const char *key = infos[i].key;
130+ for (i = 0 ; i < infoCount; i++) {
131+ const char *key = infos[i].key;
132+ if (pGetPrivateProfileStringW == NULL) {
133+ // ANSI
134134 char uimsg[MAX_UIMSG];
135135 GetI18nStr(section, key, uimsg, sizeof(uimsg), _T(""), UILanguageFile);
136136 if (uimsg[0] != '\0') {
@@ -146,10 +146,8 @@
146146 (void)r;
147147 }
148148 }
149- } else {
150- // UNICODE
151- for (i = 0 ; i < infoCount; i++) {
152- const char *key = infos[i].key;
149+ else {
150+ // UNICODE
153151 wchar_t uimsg[MAX_UIMSG];
154152 GetI18nStrW(section, key, uimsg, sizeof(uimsg), L"", UILanguageFile);
155153 if (uimsg[0] != L'\0') {
@@ -168,21 +166,38 @@
168166 }
169167 }
170168
171-void WINAPI SetI18MenuStrs(const char *section, HMENU hMenu,
172- const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile)
169+void WINAPI SetI18MenuStrs(const char *section, HMENU hMenu, const DlgTextInfo *infos, size_t infoCount,
170+ const char *UILanguageFile)
173171 {
174172 size_t i;
175173 for (i = 0; i < infoCount; i++) {
176174 const int nIDDlgItem = infos[i].nIDDlgItem;
177175 const char *key = infos[i].key;
178- TCHAR uimsg[MAX_UIMSG];
179- GetI18nStrT(section, key, uimsg, sizeof(uimsg), _T(""), UILanguageFile);
180- if (uimsg[0] != '\0') {
181- if (nIDDlgItem < 1000) {
182- ModifyMenu(hMenu, nIDDlgItem, MF_BYPOSITION, nIDDlgItem, uimsg);
183- } else {
184- ModifyMenu(hMenu, nIDDlgItem, MF_BYCOMMAND, nIDDlgItem, uimsg);
176+ if (pGetPrivateProfileStringW == NULL) {
177+ // ANSI
178+ char uimsg[MAX_UIMSG];
179+ GetI18nStr(section, key, uimsg, sizeof(uimsg), "", UILanguageFile);
180+ if (uimsg[0] != '\0') {
181+ if (nIDDlgItem < 1000) {
182+ ModifyMenuA(hMenu, nIDDlgItem, MF_BYPOSITION, nIDDlgItem, uimsg);
183+ }
184+ else {
185+ ModifyMenuA(hMenu, nIDDlgItem, MF_BYCOMMAND, nIDDlgItem, uimsg);
186+ }
185187 }
186188 }
189+ else {
190+ // UNICODE
191+ wchar_t uimsg[MAX_UIMSG];
192+ GetI18nStrW(section, key, uimsg, sizeof(uimsg), L"", UILanguageFile);
193+ if (uimsg[0] != '\0') {
194+ if (nIDDlgItem < 1000) {
195+ pModifyMenuW(hMenu, nIDDlgItem, MF_BYPOSITION, nIDDlgItem, uimsg);
196+ }
197+ else {
198+ pModifyMenuW(hMenu, nIDDlgItem, MF_BYCOMMAND, nIDDlgItem, uimsg);
199+ }
200+ }
201+ }
187202 }
188203 }
--- branches/unicode_buf/teraterm/teraterm/vtwin.cpp (revision 8245)
+++ branches/unicode_buf/teraterm/teraterm/vtwin.cpp (revision 8246)
@@ -1074,18 +1074,101 @@
10741074
10751075 void CVTWindow::InitMenu(HMENU *Menu)
10761076 {
1077- *Menu = LoadMenu(m_hInst,
1078- MAKEINTRESOURCE(IDR_MENU));
1079- char uimsg[MAX_UIMSG];
1080- int ret;
1077+ static const DlgTextInfo MenuTextInfo[] = {
1078+ { ID_FILE, "MENU_FILE" },
1079+ { ID_EDIT, "MENU_EDIT" },
1080+ { ID_SETUP, "MENU_SETUP" },
1081+ { ID_CONTROL, "MENU_CONTROL" },
1082+ { ID_HELPMENU, "MENU_HELP" },
1083+ };
1084+ static const DlgTextInfo FileMenuTextInfo[] = {
1085+ { ID_FILE_NEWCONNECTION, "MENU_FILE_NEW" },
1086+ { ID_FILE_DUPLICATESESSION, "MENU_FILE_DUPLICATE" },
1087+ { ID_FILE_CYGWINCONNECTION, "MENU_FILE_GYGWIN" },
1088+ { ID_FILE_LOG, "MENU_FILE_LOG" },
1089+ { ID_FILE_COMMENTTOLOG, "MENU_FILE_COMMENTLOG" },
1090+ { ID_FILE_VIEWLOG, "MENU_FILE_VIEWLOG" },
1091+ { ID_FILE_SHOWLOGDIALOG, "MENU_FILE_SHOWLOGDIALOG" },
1092+ { ID_FILE_SENDFILE, "MENU_FILE_SENDFILE" },
1093+ { ID_FILE_REPLAYLOG, "MENU_FILE_REPLAYLOG" },
1094+ { ID_FILE_CHANGEDIR, "MENU_FILE_CHANGEDIR" },
1095+ { ID_FILE_LOGMEIN, "MENU_FILE_LOGMETT" },
1096+ { ID_FILE_PRINT2, "MENU_FILE_PRINT" },
1097+ { ID_FILE_DISCONNECT, "MENU_FILE_DISCONNECT" },
1098+ { ID_FILE_EXIT, "MENU_FILE_EXIT" },
1099+ { ID_FILE_EXITALL, "MENU_FILE_EXITALL" },
1100+ { 9, "MENU_TRANS" },
1101+ { ID_FILE_KERMITRCV, "MENU_TRANS_KERMIT_RCV" },
1102+ { ID_FILE_KERMITGET, "MENU_TRANS_KERMIT_GET" },
1103+ { ID_FILE_KERMITSEND, "MENU_TRANS_KERMIT_SEND" },
1104+ { ID_FILE_KERMITFINISH, "MENU_TRANS_KERMIT_FINISH" },
1105+ { ID_FILE_XRCV, "MENU_TRANS_X_RCV" },
1106+ { ID_FILE_XSEND, "MENU_TRANS_X_SEND" },
1107+ { ID_FILE_YRCV, "MENU_TRANS_Y_RCV" },
1108+ { ID_FILE_YSEND, "MENU_TRANS_Y_SEND" },
1109+ { ID_FILE_ZRCV, "MENU_TRANS_Z_RCV" },
1110+ { ID_FILE_ZSEND, "MENU_TRANS_Z_SEND" },
1111+ { ID_FILE_BPRCV, "MENU_TRANS_BP_RCV" },
1112+ { ID_FILE_BPSEND, "MENU_TRANS_BP_SEND" },
1113+ { ID_FILE_QVRCV, "MENU_TRANS_QV_RCV" },
1114+ { ID_FILE_QVSEND, "MENU_TRANS_QV_SEND" },
1115+ };
1116+ static const DlgTextInfo EditMenuTextInfo[] = {
1117+ { ID_EDIT_COPY2, "MENU_EDIT_COPY" },
1118+ { ID_EDIT_COPYTABLE, "MENU_EDIT_COPYTABLE" },
1119+ { ID_EDIT_PASTE2, "MENU_EDIT_PASTE" },
1120+ { ID_EDIT_PASTECR, "MENU_EDIT_PASTECR" },
1121+ { ID_EDIT_CLEARSCREEN, "MENU_EDIT_CLSCREEN" },
1122+ { ID_EDIT_CLEARBUFFER, "MENU_EDIT_CLBUFFER" },
1123+ { ID_EDIT_CANCELSELECT, "MENU_EDIT_CANCELSELECT" },
1124+ { ID_EDIT_SELECTSCREEN, "MENU_EDIT_SELECTSCREEN" },
1125+ { ID_EDIT_SELECTALL, "MENU_EDIT_SELECTALL" },
1126+ };
1127+ static const DlgTextInfo SetupMenuTextInfo[] = {
1128+ { ID_SETUP_TERMINAL, "MENU_SETUP_TERMINAL" },
1129+ { ID_SETUP_WINDOW, "MENU_SETUP_WINDOW" },
1130+ { ID_SETUP_FONT, "MENU_SETUP_FONT" },
1131+ { ID_SETUP_DLG_FONT, "MENU_SETUP_DIALOG_FONT" },
1132+ { 2, "MENU_SETUP_FONT_SUBMENU" },
1133+ { ID_SETUP_KEYBOARD, "MENU_SETUP_KEYBOARD" },
1134+ { ID_SETUP_SERIALPORT, "MENU_SETUP_SERIALPORT" },
1135+ { ID_SETUP_TCPIP, "MENU_SETUP_TCPIP" },
1136+ { ID_SETUP_GENERAL, "MENU_SETUP_GENERAL" },
1137+ { ID_SETUP_ADDITIONALSETTINGS, "MENU_SETUP_ADDITION" },
1138+ { ID_SETUP_SAVE, "MENU_SETUP_SAVE" },
1139+ { ID_SETUP_RESTORE, "MENU_SETUP_RESTORE" },
1140+ { ID_OPEN_SETUP, "MENU_SETUP_OPENSETUP" },
1141+ { ID_SETUP_LOADKEYMAP, "MENU_SETUP_LOADKEYMAP" },
1142+ };
1143+ static const DlgTextInfo ControlMenuTextInfo[] = {
1144+ { ID_CONTROL_RESETTERMINAL, "MENU_CONTROL_RESET" },
1145+ { ID_CONTROL_RESETREMOTETITLE, "MENU_CONTROL_RESETTITLE" },
1146+ { ID_CONTROL_AREYOUTHERE, "MENU_CONTROL_AREYOUTHERE" },
1147+ { ID_CONTROL_SENDBREAK, "MENU_CONTROL_SENDBREAK" },
1148+ { ID_CONTROL_RESETPORT, "MENU_CONTROL_RESETPORT" },
1149+ { ID_CONTROL_BROADCASTCOMMAND, "MENU_CONTROL_BROADCAST" },
1150+ { ID_CONTROL_OPENTEK, "MENU_CONTROL_OPENTEK" },
1151+ { ID_CONTROL_CLOSETEK, "MENU_CONTROL_CLOSETEK" },
1152+ { ID_CONTROL_MACRO, "MENU_CONTROL_MACRO" },
1153+ { ID_CONTROL_SHOW_MACRO, "MENU_CONTROL_SHOW_MACRO" },
1154+ };
1155+ static const DlgTextInfo HelpMenuTextInfo[] = {
1156+ { ID_HELP_INDEX2, "MENU_HELP_INDEX" },
1157+ { ID_HELP_ABOUT, "MENU_HELP_ABOUT" },
1158+ };
10811159
1082- FileMenu = GetSubMenu(*Menu,ID_FILE);
1160+ HMENU hMenu = LoadMenu(m_hInst, MAKEINTRESOURCE(IDR_MENU));
1161+ *Menu = hMenu;
1162+
1163+ FileMenu = GetSubMenu(hMenu,ID_FILE);
10831164 TransMenu = GetSubMenu(FileMenu,ID_TRANSFER);
1084- EditMenu = GetSubMenu(*Menu,ID_EDIT);
1085- SetupMenu = GetSubMenu(*Menu,ID_SETUP);
1086- ControlMenu = GetSubMenu(*Menu,ID_CONTROL);
1087- HelpMenu = GetSubMenu(*Menu,ID_HELPMENU);
1165+ EditMenu = GetSubMenu(hMenu,ID_EDIT);
1166+ SetupMenu = GetSubMenu(hMenu,ID_SETUP);
1167+ ControlMenu = GetSubMenu(hMenu,ID_CONTROL);
1168+ HelpMenu = GetSubMenu(hMenu,ID_HELPMENU);
10881169
1170+ SetDlgMenuTexts(hMenu, MenuTextInfo, _countof(MenuTextInfo), ts.UILanguageFile);
1171+
10891172 /* LogMeTT の存在を確認してメニューを追加する */
10901173 if (isLogMeTTExist()) {
10911174 ::InsertMenu(FileMenu, ID_FILE_PRINT2, MF_STRING | MF_ENABLED | MF_BYCOMMAND,
@@ -1093,241 +1176,23 @@
10931176 ::InsertMenu(FileMenu, ID_FILE_PRINT2, MF_SEPARATOR, NULL, NULL);
10941177 }
10951178
1096- GetMenuString(*Menu, ID_FILE, uimsg, sizeof(uimsg), MF_BYPOSITION);
1097- get_lang_msg("MENU_FILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1098- ModifyMenu(*Menu, ID_FILE, MF_BYPOSITION, ID_FILE, ts.UIMsg);
1099- GetMenuString(FileMenu, ID_FILE_NEWCONNECTION, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1100- get_lang_msg("MENU_FILE_NEW", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1101- ModifyMenu(FileMenu, ID_FILE_NEWCONNECTION, MF_BYCOMMAND, ID_FILE_NEWCONNECTION, ts.UIMsg);
1102- GetMenuString(FileMenu, ID_FILE_DUPLICATESESSION, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1103- get_lang_msg("MENU_FILE_DUPLICATE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1104- ModifyMenu(FileMenu, ID_FILE_DUPLICATESESSION, MF_BYCOMMAND, ID_FILE_DUPLICATESESSION, ts.UIMsg);
1105- GetMenuString(FileMenu, ID_FILE_CYGWINCONNECTION, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1106- get_lang_msg("MENU_FILE_GYGWIN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1107- ModifyMenu(FileMenu, ID_FILE_CYGWINCONNECTION, MF_BYCOMMAND, ID_FILE_CYGWINCONNECTION, ts.UIMsg);
1108- GetMenuString(FileMenu, ID_FILE_LOG, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1109- get_lang_msg("MENU_FILE_LOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1110- ModifyMenu(FileMenu, ID_FILE_LOG, MF_BYCOMMAND, ID_FILE_LOG, ts.UIMsg);
1111- GetMenuString(FileMenu, ID_FILE_COMMENTTOLOG, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1112- get_lang_msg("MENU_FILE_COMMENTLOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1113- ModifyMenu(FileMenu, ID_FILE_COMMENTTOLOG, MF_BYCOMMAND, ID_FILE_COMMENTTOLOG, ts.UIMsg);
1114- GetMenuString(FileMenu, ID_FILE_VIEWLOG, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1115- get_lang_msg("MENU_FILE_VIEWLOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1116- ModifyMenu(FileMenu, ID_FILE_VIEWLOG, MF_BYCOMMAND, ID_FILE_VIEWLOG, ts.UIMsg);
1117- GetMenuString(FileMenu, ID_FILE_SHOWLOGDIALOG, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1118- get_lang_msg("MENU_FILE_SHOWLOGDIALOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1119- ModifyMenu(FileMenu, ID_FILE_SHOWLOGDIALOG, MF_BYCOMMAND, ID_FILE_SHOWLOGDIALOG, ts.UIMsg);
1120- GetMenuString(FileMenu, ID_FILE_SENDFILE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1121- get_lang_msg("MENU_FILE_SENDFILE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1122- ModifyMenu(FileMenu, ID_FILE_SENDFILE, MF_BYCOMMAND, ID_FILE_SENDFILE, ts.UIMsg);
1123- GetMenuString(FileMenu, ID_FILE_REPLAYLOG, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1124- get_lang_msg("MENU_FILE_REPLAYLOG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1125- ModifyMenu(FileMenu, ID_FILE_REPLAYLOG, MF_BYCOMMAND, ID_FILE_REPLAYLOG, ts.UIMsg);
1126- GetMenuString(FileMenu, ID_FILE_CHANGEDIR, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1127- get_lang_msg("MENU_FILE_CHANGEDIR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1128- ModifyMenu(FileMenu, ID_FILE_CHANGEDIR, MF_BYCOMMAND, ID_FILE_CHANGEDIR, ts.UIMsg);
1129- ret = GetMenuString(FileMenu, ID_FILE_LOGMEIN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1130- if (ret != 0) {
1131- get_lang_msg("MENU_FILE_LOGMETT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1132- ModifyMenu(FileMenu, ID_FILE_LOGMEIN, MF_BYCOMMAND, ID_FILE_LOGMEIN, ts.UIMsg);
1133- }
1134- GetMenuString(FileMenu, ID_FILE_PRINT2, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1135- get_lang_msg("MENU_FILE_PRINT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1136- ModifyMenu(FileMenu, ID_FILE_PRINT2, MF_BYCOMMAND, ID_FILE_PRINT2, ts.UIMsg);
1137- GetMenuString(FileMenu, ID_FILE_DISCONNECT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1138- get_lang_msg("MENU_FILE_DISCONNECT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1139- ModifyMenu(FileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND, ID_FILE_DISCONNECT, ts.UIMsg);
1140- GetMenuString(FileMenu, ID_FILE_EXIT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1141- get_lang_msg("MENU_FILE_EXIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1142- ModifyMenu(FileMenu, ID_FILE_EXIT, MF_BYCOMMAND, ID_FILE_EXIT, ts.UIMsg);
1143- GetMenuString(FileMenu, ID_FILE_EXITALL, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1144- get_lang_msg("MENU_FILE_EXITALL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1145- ModifyMenu(FileMenu, ID_FILE_EXITALL, MF_BYCOMMAND, ID_FILE_EXITALL, ts.UIMsg);
1179+ SetDlgMenuTexts(FileMenu, FileMenuTextInfo, _countof(FileMenuTextInfo), ts.UILanguageFile);
1180+ SetDlgMenuTexts(hMenu, EditMenuTextInfo, _countof(EditMenuTextInfo), ts.UILanguageFile);
1181+ SetDlgMenuTexts(SetupMenu, SetupMenuTextInfo, _countof(SetupMenuTextInfo), ts.UILanguageFile);
1182+ SetDlgMenuTexts(hMenu, ControlMenuTextInfo, _countof(ControlMenuTextInfo), ts.UILanguageFile);
1183+ SetDlgMenuTexts(hMenu, HelpMenuTextInfo, _countof(HelpMenuTextInfo), ts.UILanguageFile);
11461184
1147- GetMenuString(FileMenu, 9, uimsg, sizeof(uimsg), MF_BYPOSITION);
1148- get_lang_msg("MENU_TRANS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1149- ModifyMenu(FileMenu, 9, MF_BYPOSITION, 9, ts.UIMsg);
1150-
1151- GetMenuString(FileMenu, ID_FILE_KERMITRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1152- get_lang_msg("MENU_TRANS_KERMIT_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1153- ModifyMenu(FileMenu, ID_FILE_KERMITRCV, MF_BYCOMMAND, ID_FILE_KERMITRCV, ts.UIMsg);
1154- GetMenuString(FileMenu, ID_FILE_KERMITGET, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1155- get_lang_msg("MENU_TRANS_KERMIT_GET", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1156- ModifyMenu(FileMenu, ID_FILE_KERMITGET, MF_BYCOMMAND, ID_FILE_KERMITGET, ts.UIMsg);
1157- GetMenuString(FileMenu, ID_FILE_KERMITSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1158- get_lang_msg("MENU_TRANS_KERMIT_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1159- ModifyMenu(FileMenu, ID_FILE_KERMITSEND, MF_BYCOMMAND, ID_FILE_KERMITSEND, ts.UIMsg);
1160- GetMenuString(FileMenu, ID_FILE_KERMITFINISH, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1161- get_lang_msg("MENU_TRANS_KERMIT_FINISH", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1162- ModifyMenu(FileMenu, ID_FILE_KERMITFINISH, MF_BYCOMMAND, ID_FILE_KERMITFINISH, ts.UIMsg);
1163-
1164- GetMenuString(FileMenu, ID_FILE_XRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1165- get_lang_msg("MENU_TRANS_X_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1166- ModifyMenu(FileMenu, ID_FILE_XRCV, MF_BYCOMMAND, ID_FILE_XRCV, ts.UIMsg);
1167- GetMenuString(FileMenu, ID_FILE_XSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1168- get_lang_msg("MENU_TRANS_X_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1169- ModifyMenu(FileMenu, ID_FILE_XSEND, MF_BYCOMMAND, ID_FILE_XSEND, ts.UIMsg);
1170-
1171- GetMenuString(FileMenu, ID_FILE_YRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1172- get_lang_msg("MENU_TRANS_Y_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1173- ModifyMenu(FileMenu, ID_FILE_YRCV, MF_BYCOMMAND, ID_FILE_YRCV, ts.UIMsg);
1174- GetMenuString(FileMenu, ID_FILE_YSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1175- get_lang_msg("MENU_TRANS_Y_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1176- ModifyMenu(FileMenu, ID_FILE_YSEND, MF_BYCOMMAND, ID_FILE_YSEND, ts.UIMsg);
1177-
1178- GetMenuString(FileMenu, ID_FILE_ZRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1179- get_lang_msg("MENU_TRANS_Z_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1180- ModifyMenu(FileMenu, ID_FILE_ZRCV, MF_BYCOMMAND, ID_FILE_ZRCV, ts.UIMsg);
1181- GetMenuString(FileMenu, ID_FILE_ZSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1182- get_lang_msg("MENU_TRANS_Z_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1183- ModifyMenu(FileMenu, ID_FILE_ZSEND, MF_BYCOMMAND, ID_FILE_ZSEND, ts.UIMsg);
1184-
1185- GetMenuString(FileMenu, ID_FILE_BPRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1186- get_lang_msg("MENU_TRANS_BP_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1187- ModifyMenu(FileMenu, ID_FILE_BPRCV, MF_BYCOMMAND, ID_FILE_BPRCV, ts.UIMsg);
1188- GetMenuString(FileMenu, ID_FILE_BPSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1189- get_lang_msg("MENU_TRANS_BP_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1190- ModifyMenu(FileMenu, ID_FILE_BPSEND, MF_BYCOMMAND, ID_FILE_BPSEND, ts.UIMsg);
1191-
1192- GetMenuString(FileMenu, ID_FILE_QVRCV, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1193- get_lang_msg("MENU_TRANS_QV_RCV", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1194- ModifyMenu(FileMenu, ID_FILE_QVRCV, MF_BYCOMMAND, ID_FILE_QVRCV, ts.UIMsg);
1195- GetMenuString(FileMenu, ID_FILE_QVSEND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1196- get_lang_msg("MENU_TRANS_QV_SEND", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1197- ModifyMenu(FileMenu, ID_FILE_QVSEND, MF_BYCOMMAND, ID_FILE_QVSEND, ts.UIMsg);
1198-
1199- GetMenuString(*Menu, ID_EDIT, uimsg, sizeof(uimsg), MF_BYPOSITION);
1200- get_lang_msg("MENU_EDIT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1201- ModifyMenu(*Menu, ID_EDIT, MF_BYPOSITION, ID_EDIT, ts.UIMsg);
1202- GetMenuString(EditMenu, ID_EDIT_COPY2, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1203- get_lang_msg("MENU_EDIT_COPY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1204- ModifyMenu(EditMenu, ID_EDIT_COPY2, MF_BYCOMMAND, ID_EDIT_COPY2, ts.UIMsg);
1205- GetMenuString(EditMenu, ID_EDIT_COPYTABLE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1206- get_lang_msg("MENU_EDIT_COPYTABLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1207- ModifyMenu(EditMenu, ID_EDIT_COPYTABLE, MF_BYCOMMAND, ID_EDIT_COPYTABLE, ts.UIMsg);
1208- GetMenuString(EditMenu, ID_EDIT_PASTE2, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1209- get_lang_msg("MENU_EDIT_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1210- ModifyMenu(EditMenu, ID_EDIT_PASTE2, MF_BYCOMMAND, ID_EDIT_PASTE2, ts.UIMsg);
1211- GetMenuString(EditMenu, ID_EDIT_PASTECR, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1212- get_lang_msg("MENU_EDIT_PASTECR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1213- ModifyMenu(EditMenu, ID_EDIT_PASTECR, MF_BYCOMMAND, ID_EDIT_PASTECR, ts.UIMsg);
1214- GetMenuString(EditMenu, ID_EDIT_CLEARSCREEN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1215- get_lang_msg("MENU_EDIT_CLSCREEN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1216- ModifyMenu(EditMenu, ID_EDIT_CLEARSCREEN, MF_BYCOMMAND, ID_EDIT_CLEARSCREEN, ts.UIMsg);
1217- GetMenuString(EditMenu, ID_EDIT_CLEARBUFFER, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1218- get_lang_msg("MENU_EDIT_CLBUFFER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1219- ModifyMenu(EditMenu, ID_EDIT_CLEARBUFFER, MF_BYCOMMAND, ID_EDIT_CLEARBUFFER, ts.UIMsg);
1220- GetMenuString(EditMenu, ID_EDIT_CANCELSELECT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1221- get_lang_msg("MENU_EDIT_CANCELSELECT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1222- ModifyMenu(EditMenu, ID_EDIT_CANCELSELECT, MF_BYCOMMAND, ID_EDIT_CANCELSELECT, ts.UIMsg);
1223- GetMenuString(EditMenu, ID_EDIT_SELECTSCREEN, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1224- get_lang_msg("MENU_EDIT_SELECTSCREEN", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1225- ModifyMenu(EditMenu, ID_EDIT_SELECTSCREEN, MF_BYCOMMAND, ID_EDIT_SELECTSCREEN, ts.UIMsg);
1226- GetMenuString(EditMenu, ID_EDIT_SELECTALL, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1227- get_lang_msg("MENU_EDIT_SELECTALL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1228- ModifyMenu(EditMenu, ID_EDIT_SELECTALL, MF_BYCOMMAND, ID_EDIT_SELECTALL, ts.UIMsg);
1229-
1230- GetMenuString(*Menu, ID_SETUP, uimsg, sizeof(uimsg), MF_BYPOSITION);
1231- get_lang_msg("MENU_SETUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1232- ModifyMenu(*Menu, ID_SETUP, MF_BYPOSITION, ID_SETUP, ts.UIMsg);
1233- GetMenuString(SetupMenu, ID_SETUP_TERMINAL, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1234- get_lang_msg("MENU_SETUP_TERMINAL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1235- ModifyMenu(SetupMenu, ID_SETUP_TERMINAL, MF_BYCOMMAND, ID_SETUP_TERMINAL, ts.UIMsg);
1236- GetMenuString(SetupMenu, ID_SETUP_WINDOW, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1237- get_lang_msg("MENU_SETUP_WINDOW", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1238- ModifyMenu(SetupMenu, ID_SETUP_WINDOW, MF_BYCOMMAND, ID_SETUP_WINDOW, ts.UIMsg);
1239- GetMenuString(SetupMenu, ID_SETUP_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1240- get_lang_msg("MENU_SETUP_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1241- ModifyMenu(SetupMenu, ID_SETUP_FONT, MF_BYCOMMAND, ID_SETUP_FONT, ts.UIMsg);
1242- GetMenuString(SetupMenu, ID_SETUP_DLG_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1243- get_lang_msg("MENU_SETUP_DIALOG_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1244- ModifyMenu(SetupMenu, ID_SETUP_DLG_FONT, MF_BYCOMMAND, ID_SETUP_DLG_FONT, ts.UIMsg);
1245- GetMenuString(SetupMenu, 2, uimsg, sizeof(uimsg), MF_BYPOSITION);
1246- get_lang_msg("MENU_SETUP_FONT_SUBMENU", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1247- ModifyMenu(SetupMenu, 2, MF_BYPOSITION, 2, ts.UIMsg);
1248- GetMenuString(SetupMenu, ID_SETUP_KEYBOARD, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1249- get_lang_msg("MENU_SETUP_KEYBOARD", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1250- ModifyMenu(SetupMenu, ID_SETUP_KEYBOARD, MF_BYCOMMAND, ID_SETUP_KEYBOARD, ts.UIMsg);
1251- GetMenuString(SetupMenu, ID_SETUP_SERIALPORT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1252- get_lang_msg("MENU_SETUP_SERIALPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1253- ModifyMenu(SetupMenu, ID_SETUP_SERIALPORT, MF_BYCOMMAND, ID_SETUP_SERIALPORT, ts.UIMsg);
1254- GetMenuString(SetupMenu, ID_SETUP_TCPIP, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1255- get_lang_msg("MENU_SETUP_TCPIP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1256- ModifyMenu(SetupMenu, ID_SETUP_TCPIP, MF_BYCOMMAND, ID_SETUP_TCPIP, ts.UIMsg);
1257- GetMenuString(SetupMenu, ID_SETUP_GENERAL, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1258- get_lang_msg("MENU_SETUP_GENERAL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1259- ModifyMenu(SetupMenu, ID_SETUP_GENERAL, MF_BYCOMMAND, ID_SETUP_GENERAL, ts.UIMsg);
1260- GetMenuString(SetupMenu, ID_SETUP_ADDITIONALSETTINGS, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1261- get_lang_msg("MENU_SETUP_ADDITION", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1262- ModifyMenu(SetupMenu, ID_SETUP_ADDITIONALSETTINGS, MF_BYCOMMAND, ID_SETUP_ADDITIONALSETTINGS, ts.UIMsg);
1263- GetMenuString(SetupMenu, ID_SETUP_SAVE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1264- get_lang_msg("MENU_SETUP_SAVE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1265- ModifyMenu(SetupMenu, ID_SETUP_SAVE, MF_BYCOMMAND, ID_SETUP_SAVE, ts.UIMsg);
1266- GetMenuString(SetupMenu, ID_SETUP_RESTORE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1267- get_lang_msg("MENU_SETUP_RESTORE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1268- ModifyMenu(SetupMenu, ID_SETUP_RESTORE, MF_BYCOMMAND, ID_SETUP_RESTORE, ts.UIMsg);
1269- GetMenuString(SetupMenu, ID_OPEN_SETUP, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1270- get_lang_msg("MENU_SETUP_OPENSETUP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1271- ModifyMenu(SetupMenu, ID_OPEN_SETUP, MF_BYCOMMAND, ID_OPEN_SETUP, ts.UIMsg);
1272- GetMenuString(SetupMenu, ID_SETUP_LOADKEYMAP, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1273- get_lang_msg("MENU_SETUP_LOADKEYMAP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1274- ModifyMenu(SetupMenu, ID_SETUP_LOADKEYMAP, MF_BYCOMMAND, ID_SETUP_LOADKEYMAP, ts.UIMsg);
1275-
1276- GetMenuString(*Menu, ID_CONTROL, uimsg, sizeof(uimsg), MF_BYPOSITION);
1277- get_lang_msg("MENU_CONTROL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1278- ModifyMenu(*Menu, ID_CONTROL, MF_BYPOSITION, ID_CONTROL, ts.UIMsg);
1279- GetMenuString(ControlMenu, ID_CONTROL_RESETTERMINAL, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1280- get_lang_msg("MENU_CONTROL_RESET", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1281- ModifyMenu(ControlMenu, ID_CONTROL_RESETTERMINAL, MF_BYCOMMAND, ID_CONTROL_RESETTERMINAL, ts.UIMsg);
1282- GetMenuString(ControlMenu, ID_CONTROL_RESETREMOTETITLE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1283- get_lang_msg("MENU_CONTROL_RESETTITLE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1284- ModifyMenu(ControlMenu, ID_CONTROL_RESETREMOTETITLE, MF_BYCOMMAND, ID_CONTROL_RESETREMOTETITLE, ts.UIMsg);
1285- GetMenuString(ControlMenu, ID_CONTROL_AREYOUTHERE, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1286- get_lang_msg("MENU_CONTROL_AREYOUTHERE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1287- ModifyMenu(ControlMenu, ID_CONTROL_AREYOUTHERE, MF_BYCOMMAND, ID_CONTROL_AREYOUTHERE, ts.UIMsg);
1288- GetMenuString(ControlMenu, ID_CONTROL_SENDBREAK, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1289- get_lang_msg("MENU_CONTROL_SENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1290- ModifyMenu(ControlMenu, ID_CONTROL_SENDBREAK, MF_BYCOMMAND, ID_CONTROL_SENDBREAK, ts.UIMsg);
1291- GetMenuString(ControlMenu, ID_CONTROL_RESETPORT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1292- get_lang_msg("MENU_CONTROL_RESETPORT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1293- ModifyMenu(ControlMenu, ID_CONTROL_RESETPORT, MF_BYCOMMAND, ID_CONTROL_RESETPORT, ts.UIMsg);
1294- GetMenuString(ControlMenu, ID_CONTROL_BROADCASTCOMMAND, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1295- get_lang_msg("MENU_CONTROL_BROADCAST", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1296- ModifyMenu(ControlMenu, ID_CONTROL_BROADCASTCOMMAND, MF_BYCOMMAND, ID_CONTROL_BROADCASTCOMMAND, ts.UIMsg);
1297- GetMenuString(ControlMenu, ID_CONTROL_OPENTEK, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1298- get_lang_msg("MENU_CONTROL_OPENTEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1299- ModifyMenu(ControlMenu, ID_CONTROL_OPENTEK, MF_BYCOMMAND, ID_CONTROL_OPENTEK, ts.UIMsg);
1300- GetMenuString(ControlMenu, ID_CONTROL_CLOSETEK, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1301- get_lang_msg("MENU_CONTROL_CLOSETEK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1302- ModifyMenu(ControlMenu, ID_CONTROL_CLOSETEK, MF_BYCOMMAND, ID_CONTROL_CLOSETEK, ts.UIMsg);
1303-
1304- GetMenuString(ControlMenu, ID_CONTROL_MACRO, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1305- get_lang_msg("MENU_CONTROL_MACRO", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1306- ModifyMenu(ControlMenu, ID_CONTROL_MACRO, MF_BYCOMMAND, ID_CONTROL_MACRO, ts.UIMsg);
1307- GetMenuString(ControlMenu, ID_CONTROL_SHOW_MACRO, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1308- get_lang_msg("MENU_CONTROL_SHOW_MACRO", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1309- ModifyMenu(ControlMenu, ID_CONTROL_SHOW_MACRO, MF_BYCOMMAND, ID_CONTROL_SHOW_MACRO, ts.UIMsg);
1310-
1311- GetMenuString(*Menu, ID_HELPMENU, uimsg, sizeof(uimsg), MF_BYPOSITION);
1312- get_lang_msg("MENU_HELP", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1313- ModifyMenu(*Menu, ID_HELPMENU, MF_BYPOSITION, ID_HELPMENU, ts.UIMsg);
1314- GetMenuString(HelpMenu, ID_HELP_INDEX2, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1315- get_lang_msg("MENU_HELP_INDEX", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1316- ModifyMenu(HelpMenu, ID_HELP_INDEX2, MF_BYCOMMAND, ID_HELP_INDEX2, ts.UIMsg);
1317- GetMenuString(HelpMenu, ID_HELP_ABOUT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1318- get_lang_msg("MENU_HELP_ABOUT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1319- ModifyMenu(HelpMenu, ID_HELP_ABOUT, MF_BYCOMMAND, ID_HELP_ABOUT, ts.UIMsg);
1320-
13211185 if ((ts.MenuFlag & MF_SHOWWINMENU) !=0) {
1186+ TCHAR uimsg[MAX_UIMSG];
13221187 WinMenu = CreatePopupMenu();
1323- get_lang_msg("MENU_WINDOW", ts.UIMsg, sizeof(ts.UIMsg),
1324- "&Window", ts.UILanguageFile);
1325- ::InsertMenu(*Menu,ID_HELPMENU,
1326- MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
1327- (UINT_PTR)WinMenu, ts.UIMsg);
1188+ get_lang_msgT("MENU_WINDOW", uimsg, _countof(uimsg),
1189+ _T("&Window"), ts.UILanguageFile);
1190+ ::InsertMenu(hMenu, ID_HELPMENU,
1191+ MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
1192+ (UINT_PTR)WinMenu, uimsg);
13281193 }
13291194
1330- TTXModifyMenu(*Menu); /* TTPLUG */
1195+ TTXModifyMenu(hMenu); /* TTPLUG */
13311196 }
13321197
13331198 void CVTWindow::InitMenuPopup(HMENU SubMenu)
@@ -1502,17 +1367,13 @@
15021367 // added ConfirmPasteMouseRButton (2007.3.17 maya)
15031368 void CVTWindow::InitPasteMenu(HMENU *Menu)
15041369 {
1505- char uimsg[MAX_UIMSG];
1506-
1370+ static const DlgTextInfo MenuTextInfo[] = {
1371+ { ID_EDIT_PASTE2, "MENU_EDIT_PASTE" },
1372+ { ID_EDIT_PASTECR, "MENU_EDIT_PASTECR" },
1373+ };
15071374 *Menu = LoadMenu(m_hInst,
15081375 MAKEINTRESOURCE(IDR_PASTEMENU));
1509-
1510- GetMenuString(*Menu, ID_EDIT_PASTE2, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1511- get_lang_msg("MENU_EDIT_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1512- ModifyMenu(*Menu, ID_EDIT_PASTE2, MF_BYCOMMAND, ID_EDIT_PASTE2, ts.UIMsg);
1513- GetMenuString(*Menu, ID_EDIT_PASTECR, uimsg, sizeof(uimsg), MF_BYCOMMAND);
1514- get_lang_msg("MENU_EDIT_PASTECR", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
1515- ModifyMenu(*Menu, ID_EDIT_PASTECR, MF_BYCOMMAND, ID_EDIT_PASTECR, ts.UIMsg);
1376+ SetDlgMenuTexts(*Menu, MenuTextInfo, _countof(MenuTextInfo), ts.UILanguageFile);
15161377 }
15171378
15181379 void CVTWindow::ResetSetup()
Show on old repository browser