Tera TermRevision: 8349
https://osdn.net/projects/ttssh2/scm/svn/commits/8349
Author: zmatsuo
Date: 2019-10-30 22:32:15 +0900 (Wed, 30 Oct 2019)
Log Message:
-----------
MACRO ウィンドウで ESC押下時、クローズしないようにした
- 4.103からESC押下時に終了するようになっていた
- r7537 mfc依存をなくしたとき
- ESC押下、CLOSEボタン押下時の終了処理を整理
- 終了処理を2回行う場合があった
- 未使用コード削除
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/7537
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpmacro/ttmmain.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-10-30 13:32:04 UTC (rev 8348)
+++ trunk/doc/en/html/about/history.html 2019-10-30 13:32:15 UTC (rev 8349)
@@ -70,6 +70,7 @@
<li>The help button of File-Log, File-Trasnfer, Setup-Font and Printer dialog does not work well. This bug was introduced in 4.104.</li>
<li>Fixed a problem that TTIMESV (Save IME status) / TTIMERS (Restore IME status) control sequences do not work.</li>
<li>The help button on the printer dialog can not be shown from Windows 2000 to 10(except Windows95).</li>
+ <li>Don't close MACRO window when ESC key is pressed. This bug was introduced in 4.103.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-10-30 13:32:04 UTC (rev 8348)
+++ trunk/doc/ja/html/about/history.html 2019-10-30 13:32:15 UTC (rev 8349)
@@ -70,6 +70,7 @@
<li>\x83\x8D\x83O\x8D̎\xE6\x81E\x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x81E\x83t\x83H\x83\x93\x83g\x81E\x88\xF3\x8D\xFC\x83_\x83C\x83A\x83\x8D\x83O\x82̃w\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x8B@\x94\\x82\xB5\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B4.104\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
<li>TTIMESV(IME\x8F\xF3\x91ԕۑ\xB6)/TTIMERS(IME\x8F\xF3\x91ԕ\x9C\x8C\xB3)\x90\xA7\x8C\xE4\x83V\x81[\x83P\x83\x93\x83X\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x93\xAE\x82\xA9\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>Windows2000\x81`10\x82ŁA\x88\xF3\x8D\xFC\x83_\x83C\x83A\x83\x8D\x83O\x82Ƀw\x83\x8B\x83v\x83{\x83^\x83\x93\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD(Windows95\x82͏\x9C\x82\xAD)\x81B</li>
+ <li>MACRO \x83E\x83B\x83\x93\x83h\x83E\x82ŁAESC\x83L\x81[\x82\xF0\x89\x9F\x89\xBA\x8E\x9E\x8FI\x97\xB9\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B4.103\x82ł̃G\x83\x93\x83o\x83O\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmmain.cpp 2019-10-30 13:32:04 UTC (rev 8348)
+++ trunk/teraterm/ttpmacro/ttmmain.cpp 2019-10-30 13:32:15 UTC (rev 8349)
@@ -345,13 +345,12 @@
return TRUE;
}
-BOOL CCtrlWindow::OnCancel( )
+// \x83_\x83C\x83A\x83\x8D\x83O\x8F\xE3\x82ɃL\x83\x83\x83\x93\x83Z\x83\x8B\x83{\x83^\x83\x93 IDCANCEL \x82\xAA\x82Ȃ\xA2\x82̂ŁA
+// ESC\x82\xAA\x89\x9F\x82\xB3\x82ꂽ\x82Ƃ\xAB\x82\xBE\x82\xAF\x8CĂяo\x82\xB3\x82\xEA\x82\xE9
+BOOL CCtrlWindow::OnCancel()
{
-#if 1
- ::DestroyWindow(m_hStatus);
- DestroyWindow();
-#endif
- return TRUE; // cancel(ESC\x89\x9F\x89\xBA)\x82\x8B
+ // \x89\xBD\x82\xE0\x82\xB9\x82\xB8\x82\xC9TRUE\x82\xF0\x95Ԃ\xB7 -> ESC\x83L\x81[\x82\xF8\x89\xBB
+ return TRUE;
}
BOOL CCtrlWindow::OnCommand(WPARAM wParam, LPARAM lParam)
@@ -381,8 +380,7 @@
BOOL CCtrlWindow::OnClose()
{
- EndTTL();
- EndDDE();
+ DestroyWindow();
return TRUE;
}
@@ -392,7 +390,7 @@
EndTTL();
EndDDE();
-// CDialog::OnDestroy();
+ ::DestroyWindow(m_hStatus);
}
// for icon drawing in Win NT 3.5
@@ -496,13 +494,6 @@
return m_hIcon;
}
-#if 0
-void CCtrlWindow::OnSysColorChange()
-{
- CDialog::OnSysColorChange();
-}
-#endif
-
void CCtrlWindow::OnTimer(UINT_PTR nIDEvent)
{
BOOL TimeOut;
@@ -586,16 +577,6 @@
return TRUE;
}
-#if 0
-BOOL CCtrlWindow::PreTranslateMessage(MSG* pMsg)
-{
- if ((pMsg->message==WM_KEYDOWN) && (pMsg->wParam==VK_ESCAPE)) { // ignore ESC key
- return FALSE;
- }
- return CDialog::PreTranslateMessage(pMsg);
-}
-#endif
-
LRESULT CCtrlWindow::OnDdeCmndEnd(WPARAM wParam, LPARAM lParam)
{
if (TTLStatus == IdTTLWaitCmndResult) {
@@ -719,11 +700,6 @@
{
switch(msg)
{
-#if 0 // tmfc\x82ŏ\x88\x97\x9D\x82\xB3\x82\xEA\x82\xE9
- case WM_CLOSE:
- OnClose();
- break;
-#endif
case WM_DESTROY:
OnDestroy();
PostQuitMessage(0);
@@ -735,15 +711,11 @@
OnPaint();
break;
case WM_SIZE:
- OnSize(wp, LOWORD(lp), HIWORD(lp));
+ OnSize((UINT)wp, LOWORD(lp), HIWORD(lp));
break;
case WM_GETMINMAXINFO:
OnGetMinMaxInfo((MINMAXINFO *)lp);
break;
-#if 0
- case WM_QUERYDRAGICON:
- case WM_SYSCOLORCHANGE:
-#endif
case WM_TIMER:
OnTimer(wp);
break;