• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9526 (tree)
Time2021-11-12 00:30:05
Authorzmatsuo

Log Message

TTXKanjiMenu 受信文字コードUTF-8m を削除

Change Summary

Incremental Difference

--- trunk/TTXKanjiMenu/ttxkanjimenu.c (revision 9525)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c (revision 9526)
@@ -34,7 +34,7 @@
3434 #define UpdateRecvMenu(val) \
3535 CheckMenuRadioItem(pvar->hmEncode, \
3636 ID_MI_KANJIRECV + IdSJIS, \
37- ID_MI_KANJIRECV + IdUTF8m, \
37+ ID_MI_KANJIRECV + IdUTF8, \
3838 ID_MI_KANJIRECV + (val), \
3939 MF_BYCOMMAND)
4040 #define UpdateSendMenu(val) \
@@ -56,7 +56,6 @@
5656 { ID_MI_KANJIRECV + IdEUC, "Recv: &EUC-JP" },
5757 { ID_MI_KANJIRECV + IdJIS, "Recv: &JIS" },
5858 { ID_MI_KANJIRECV + IdUTF8, "Recv: &UTF-8" },
59- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m" }
6059 };
6160
6261 // 受信漢字コード (韓国語)
@@ -63,7 +62,6 @@
6362 static const KmTextInfo MenuNameRecvK[] = {
6463 { ID_MI_KANJIRECV + IdSJIS, "Recv: &KS5601" },
6564 { ID_MI_KANJIRECV + IdUTF8, "Recv: &UTF-8" },
66- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m" }
6765 };
6866
6967 // 送信漢字コード (日本語)
@@ -86,7 +84,6 @@
8684 { ID_MI_KANJIRECV + IdEUC, "Recv/Send: &EUC-JP" },
8785 { ID_MI_KANJIRECV + IdJIS, "Recv/Send: &JIS" },
8886 { ID_MI_KANJIRECV + IdUTF8, "Recv/Send: &UTF-8" },
89- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m/Send: UTF-8" }
9087 };
9188
9289 // 送受信漢字コード (韓国語)
@@ -93,7 +90,6 @@
9390 static const KmTextInfo MenuNameOneK[] = {
9491 { ID_MI_KANJIRECV + IdSJIS, "Recv/Send: &KS5601" },
9592 { ID_MI_KANJIRECV + IdUTF8, "Recv/Send: &UTF-8" },
96- { ID_MI_KANJIRECV + IdUTF8m, "Recv: UTF-8&m/Send: UTF-8" }
9793 };
9894
9995 // メニュー自体の国際化用情報 (日本語)
@@ -113,7 +109,6 @@
113109 { ID_MI_KANJIRECV + IdEUC, "MENU_RECV_EUCJP" },
114110 { ID_MI_KANJIRECV + IdJIS, "MENU_RECV_JIS" },
115111 { ID_MI_KANJIRECV + IdUTF8, "MENU_RECV_UTF8" },
116- { ID_MI_KANJIRECV + IdUTF8m, "MENU_RECV_UTF8m" },
117112 // 送信
118113 { ID_MI_KANJISEND + IdSJIS, "MENU_SEND_SJIS" },
119114 { ID_MI_KANJISEND + IdEUC, "MENU_SEND_EUCJP" },
@@ -128,7 +123,6 @@
128123 // 受信
129124 { ID_MI_KANJIRECV + IdSJIS, "MENU_RECV_KS5601" },
130125 { ID_MI_KANJIRECV + IdUTF8, "MENU_RECV_UTF8" },
131- { ID_MI_KANJIRECV + IdUTF8m, "MENU_RECV_UTF8m" },
132126 // 送信
133127 { ID_MI_KANJISEND + IdSJIS, "MENU_SEND_KS5601" },
134128 { ID_MI_KANJISEND + IdUTF8, "MENU_SEND_UTF8" },
@@ -143,7 +137,6 @@
143137 { ID_MI_KANJIRECV + IdEUC, "MENU_EUCJP" },
144138 { ID_MI_KANJIRECV + IdJIS, "MENU_JIS" },
145139 { ID_MI_KANJIRECV + IdUTF8, "MENU_UTF8" },
146- { ID_MI_KANJIRECV + IdUTF8m, "MENU_UTF8m" },
147140 // UseOneSetting
148141 { ID_MI_USEONESETTING, "MENU_USE_ONE_SETTING" }
149142 };
@@ -153,7 +146,6 @@
153146 // 送受信
154147 { ID_MI_KANJIRECV + IdSJIS, "MENU_KS5601" },
155148 { ID_MI_KANJIRECV + IdUTF8, "MENU_UTF8" },
156- { ID_MI_KANJIRECV + IdUTF8m, "MENU_UTF8m" },
157149 // UseOneSetting
158150 { ID_MI_USEONESETTING, "MENU_USE_ONE_SETTING" }
159151 };
@@ -205,19 +197,11 @@
205197 if (ret) {
206198 if (orgRecvCode == pvar->ts->KanjiCode && orgSendCode != pvar->ts->KanjiCodeSend) {
207199 // 送信コードのみ変更した場合は送信コードに合わせる
208- // ただし、送信:UTF-8 && 受信:UTF-8m の場合は対象外
209- if (pvar->ts->KanjiCodeSend != IdUTF8 || pvar->ts->KanjiCode != IdUTF8m) {
210- pvar->ts->KanjiCode = pvar->ts->KanjiCodeSend;
211- }
200+ pvar->ts->KanjiCode = pvar->ts->KanjiCodeSend;
212201 }
213202 else {
214203 // それ以外は受信コードに合わせる
215- if (pvar->ts->KanjiCode == IdUTF8m) {
216- pvar->ts->KanjiCodeSend = IdUTF8;
217- }
218- else {
219- pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
220- }
204+ pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
221205 }
222206 }
223207
@@ -231,6 +215,8 @@
231215 * 設定ダイアログ呼出の後処理のみを利用する。
232216 */
233217 static BOOL PASCAL ResetCharSet(HWND parent, PTTSet ts) {
218+ (void)parent;
219+ (void)ts;
234220 pvar->NeedResetCharSet = FALSE;
235221 return TRUE;
236222 }
@@ -273,12 +259,7 @@
273259 pvar->UseOneSetting = TRUE;
274260 // UseOneSetting が on の場合は、送受信設定が同じになるように調整する
275261 if (pvar->ts->Language == IdJapanese) {
276- if (pvar->ts->KanjiCode == IdUTF8m) {
277- pvar->ts->KanjiCodeSend = IdUTF8;
278- }
279- else {
280- pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
281- }
262+ pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
282263 }
283264 else if (pvar->ts->Language == IdKorean) {
284265 pvar->ts->KanjiCodeSend = pvar->ts->KanjiCode;
@@ -338,7 +319,7 @@
338319 * UseOneSetting が off の時に使う
339320 */
340321 static void InsertSendKcodeMenu(HMENU menu) {
341- UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
322+// UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
342323 int i;
343324
344325 if (pvar->ts->Language == IdJapanese) {
@@ -496,6 +477,7 @@
496477 */
497478 static void PASCAL TTXModifyPopupMenu(HMENU menu) {
498479 // メニューが呼び出されたら、最新の設定に更新する。(2007.5.25 yutaka)
480+ (void)menu;
499481 UpdateRecvMenu(pvar->ts->KanjiCode);
500482 if (!pvar->UseOneSetting) {
501483 UpdateSendMenu(pvar->ts->KanjiCodeSend);
@@ -510,13 +492,10 @@
510492 static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
511493 WORD val;
512494
513- if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8m)) {
495+ if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8)) {
514496 val = cmd - ID_MI_KANJIRECV;
515497 pvar->cv->KanjiCodeEcho = pvar->ts->KanjiCode = val;
516498 if (pvar->UseOneSetting) {
517- if (val == IdUTF8m) {
518- val = IdUTF8;
519- }
520499 pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
521500 }
522501 CallResetCharSet(hWin);
@@ -543,12 +522,7 @@
543522 else {
544523 pvar->UseOneSetting = TRUE;
545524
546- if (pvar->ts->KanjiCode == IdUTF8m) {
547- val = IdUTF8;
548- }
549- else {
550- val = pvar->ts->KanjiCode;
551- }
525+ val = pvar->ts->KanjiCode;
552526 pvar->cv->KanjiCodeSend = pvar->ts->KanjiCodeSend = val;
553527
554528 DeleteSendKcodeMenu(pvar->hmEncode);
@@ -593,6 +567,7 @@
593567 int size = sizeof(Exports) - sizeof(exports->size);
594568 /* do version checking if necessary */
595569 /* if (Version!=TTVERSION) return FALSE; */
570+ (void)Version;
596571
597572 if (size > exports->size) {
598573 size = exports->size;
@@ -607,6 +582,7 @@
607582 ULONG ul_reason_for_call,
608583 LPVOID lpReserved)
609584 {
585+ (void)lpReserved;
610586 switch( ul_reason_for_call ) {
611587 case DLL_THREAD_ATTACH:
612588 /* do thread initialization */
Show on old repository browser