Revision: 10001 https://osdn.net/projects/ttssh2/scm/svn/commits/10001 Author: nmaya Date: 2022-06-21 08:41:06 +0900 (Tue, 21 Jun 2022) Log Message: ----------- アプリケーション終了時にはアイコンを破棄しない ttssh2-dev 458 Modified Paths: -------------- branches/adjust_icon/teraterm/keycode/keycode.c branches/adjust_icon/teraterm/teraterm/vtwin.cpp branches/adjust_icon/teraterm/ttpmacro/ttmmain.cpp -------------- next part -------------- Modified: branches/adjust_icon/teraterm/keycode/keycode.c =================================================================== --- branches/adjust_icon/teraterm/keycode/keycode.c 2022-06-16 13:49:38 UTC (rev 10000) +++ branches/adjust_icon/teraterm/keycode/keycode.c 2022-06-20 23:41:06 UTC (rev 10001) @@ -215,7 +215,10 @@ LRESULT OnDestroy(HWND hWnd) { - TTSetIcon(ghInstance, hWnd, NULL, 0); + // \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x82ɃA\x83C\x83R\x83\x93\x82\xF0\x94j\x8A\xFC\x82\xB7\x82\xE9\x82ƁA\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8F\xC1\x82\xA6\x82\xE9\x91O\x82\xC9 + // \x83^\x83C\x83g\x83\x8B\x83o\x81[\x82̃A\x83C\x83R\x83\x93\x82\xAA "Windows \x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82̃A\x83C\x83R\x83\x93" \x82ɕς\xED\x82\xE9 + // \x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂Ŕj\x8A\xFC\x82\xB5\x82Ȃ\xA2 + // TTSetIcon(ghInstance, hWnd, NULL, 0); return TRUE; } Modified: branches/adjust_icon/teraterm/teraterm/vtwin.cpp =================================================================== --- branches/adjust_icon/teraterm/teraterm/vtwin.cpp 2022-06-16 13:49:38 UTC (rev 10000) +++ branches/adjust_icon/teraterm/teraterm/vtwin.cpp 2022-06-20 23:41:06 UTC (rev 10001) @@ -1391,7 +1391,12 @@ SaveVTPos(); NotifyUnsetWindow(&cv); - TTSetIcon(m_hInst, m_hWnd, NULL, 0); + + // \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x82ɃA\x83C\x83R\x83\x93\x82\xF0\x94j\x8A\xFC\x82\xB7\x82\xE9\x82ƁA\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8F\xC1\x82\xA6\x82\xE9\x91O\x82\xC9 + // \x83^\x83C\x83g\x83\x8B\x83o\x81[\x82̃A\x83C\x83R\x83\x93\x82\xAA "Windows \x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82̃A\x83C\x83R\x83\x93" \x82ɕς\xED\x82\xE9 + // \x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂Ŕj\x8A\xFC\x82\xB5\x82Ȃ\xA2 + // TTSetIcon(m_hInst, m_hWnd, NULL, 0); + DestroyWindow(); } Modified: branches/adjust_icon/teraterm/ttpmacro/ttmmain.cpp =================================================================== --- branches/adjust_icon/teraterm/ttpmacro/ttmmain.cpp 2022-06-16 13:49:38 UTC (rev 10000) +++ branches/adjust_icon/teraterm/ttpmacro/ttmmain.cpp 2022-06-20 23:41:06 UTC (rev 10001) @@ -377,8 +377,12 @@ EndTTL(); EndDDE(); - TTSetIcon(m_hInst, m_hWnd, NULL, 0); + // \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x82ɃA\x83C\x83R\x83\x93\x82\xF0\x94j\x8A\xFC\x82\xB7\x82\xE9\x82ƁA\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8F\xC1\x82\xA6\x82\xE9\x91O\x82\xC9 + // \x83^\x83C\x83g\x83\x8B\x83o\x81[\x82̃A\x83C\x83R\x83\x93\x82\xAA "Windows \x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82̃A\x83C\x83R\x83\x93" \x82ɕς\xED\x82\xE9 + // \x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xE9\x82̂Ŕj\x8A\xFC\x82\xB5\x82Ȃ\xA2 + // TTSetIcon(m_hInst, m_hWnd, NULL, 0); + ::DestroyWindow(m_hStatus); }