Revision: 7915 https://osdn.net/projects/ttssh2/scm/svn/commits/7915 Author: zmatsuo Date: 2019-08-06 00:35:36 +0900 (Tue, 06 Aug 2019) Log Message: ----------- Modal を Modeless と修正 Modified Paths: -------------- trunk/teraterm/teraterm/ftdlg.cpp trunk/teraterm/teraterm/teraterm.cpp trunk/teraterm/teraterm/teraterml.h -------------- next part -------------- Modified: trunk/teraterm/teraterm/ftdlg.cpp =================================================================== --- trunk/teraterm/teraterm/ftdlg.cpp 2019-08-05 15:35:24 UTC (rev 7914) +++ trunk/teraterm/teraterm/ftdlg.cpp 2019-08-05 15:35:36 UTC (rev 7915) @@ -201,7 +201,7 @@ ::PostMessage(GetSafeHwnd(), WM_SETICON, ICON_BIG, (LPARAM)BigIcon); - AddModalHandle(m_hWnd); + AddModelessHandle(m_hWnd); return TRUE; } @@ -244,7 +244,7 @@ BigIcon = NULL; } - RemoveModalHandle(m_hWnd); + RemoveModelessHandle(m_hWnd); delete this; return TRUE; Modified: trunk/teraterm/teraterm/teraterm.cpp =================================================================== --- trunk/teraterm/teraterm/teraterm.cpp 2019-08-05 15:35:24 UTC (rev 7914) +++ trunk/teraterm/teraterm/teraterm.cpp 2019-08-05 15:35:36 UTC (rev 7915) @@ -249,17 +249,17 @@ return main_window; } -static HWND hModalWnd; +static HWND hModelessDlg; -void AddModalHandle(HWND hWnd) +void AddModelessHandle(HWND hWnd) { - hModalWnd = hWnd; + hModelessDlg = hWnd; } -void RemoveModalHandle(HWND hWnd) +void RemoveModelessHandle(HWND hWnd) { (void)hWnd; - hModalWnd = 0; + hModelessDlg = 0; } static UINT nMsgLast; @@ -339,8 +339,8 @@ goto exit_message_loop; } - if (hModalWnd == 0 || - ::IsDialogMessage(hModalWnd, &msg) == FALSE) + if (hModelessDlg == 0 || + ::IsDialogMessage(hModelessDlg, &msg) == FALSE) { bool message_processed = false; Modified: trunk/teraterm/teraterm/teraterml.h =================================================================== --- trunk/teraterm/teraterm/teraterml.h 2019-08-05 15:35:24 UTC (rev 7914) +++ trunk/teraterm/teraterm/teraterml.h 2019-08-05 15:35:36 UTC (rev 7915) @@ -29,5 +29,5 @@ /* teraterm local header */ /* teraterm/ folder only */ -void AddModalHandle(HWND hWnd); -void RemoveModalHandle(HWND hWnd); +void AddModelessHandle(HWND hWnd); +void RemoveModelessHandle(HWND hWnd);