svnno****@sourc*****
svnno****@sourc*****
2015年 7月 15日 (水) 20:10:39 JST
Tera TermRevision: 5913
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5913
Author: maya
Date: 2015-07-15 20:10:38 +0900 (Wed, 15 Jul 2015)
Log Message:
-----------
ウィンドウを最前面に持ってくる共通関数を使うようにした
CMsgDlg::Bringup(), CInpDlg::Bringup(), CListDlg::Bringup() を削除
CStatDlg::Bringup は外部から呼ばれているので、共通関数を呼ぶメソッドとして残す
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ListDlg.cpp
trunk/teraterm/ttpmacro/ListDlg.h
trunk/teraterm/ttpmacro/inpdlg.cpp
trunk/teraterm/ttpmacro/inpdlg.h
trunk/teraterm/ttpmacro/msgdlg.cpp
trunk/teraterm/ttpmacro/msgdlg.h
trunk/teraterm/ttpmacro/statdlg.cpp
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ListDlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ListDlg.cpp 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/ListDlg.cpp 2015-07-15 11:10:38 UTC (rev 5913)
@@ -140,7 +140,7 @@
Relocation(TRUE, WW);
- Bringup();
+ BringupWindow(this->m_hWnd);
return TRUE; // return TRUE unless you set the focus to a control
// \x97\xE1\x8AO : OCX \x83v\x83\x8D\x83p\x83e\x83B \x83y\x81[\x83W\x82͕K\x82\xB8 FALSE \x82\xF0\x95Ԃ\xB5\x82܂\xB7\x81B
@@ -204,23 +204,3 @@
InvalidateRect(NULL);
}
-
-void CListDlg::Bringup()
-{
- DWORD pid;
- DWORD thisThreadId;
- DWORD fgThreadId;
-
- thisThreadId = GetWindowThreadProcessId(GetSafeHwnd(), &pid);
- fgThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
-
- if (thisThreadId == fgThreadId) {
- SetForegroundWindow();
- BringWindowToTop();
- } else {
- AttachThreadInput(thisThreadId, fgThreadId, TRUE);
- SetForegroundWindow();
- BringWindowToTop();
- AttachThreadInput(thisThreadId, fgThreadId, FALSE);
- }
-}
Modified: trunk/teraterm/ttpmacro/ListDlg.h
===================================================================
--- trunk/teraterm/ttpmacro/ListDlg.h 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/ListDlg.h 2015-07-15 11:10:38 UTC (rev 5913)
@@ -25,7 +25,6 @@
HFONT DlgFont;
void Relocation(BOOL is_init, int WW);
- void Bringup();
DECLARE_MESSAGE_MAP()
public:
Modified: trunk/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/inpdlg.cpp 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/inpdlg.cpp 2015-07-15 11:10:38 UTC (rev 5913)
@@ -100,7 +100,7 @@
Relocation(TRUE, WW);
- Bringup();
+ BringupWindow(this->m_hWnd);
return TRUE;
}
@@ -186,24 +186,3 @@
InvalidateRect(NULL);
}
-
-
-void CInpDlg::Bringup()
-{
- DWORD pid;
- DWORD thisThreadId;
- DWORD fgThreadId;
-
- thisThreadId = GetWindowThreadProcessId(GetSafeHwnd(), &pid);
- fgThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
-
- if (thisThreadId == fgThreadId) {
- SetForegroundWindow();
- BringWindowToTop();
- } else {
- AttachThreadInput(thisThreadId, fgThreadId, TRUE);
- SetForegroundWindow();
- BringWindowToTop();
- AttachThreadInput(thisThreadId, fgThreadId, FALSE);
- }
-}
Modified: trunk/teraterm/ttpmacro/inpdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/inpdlg.h 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/inpdlg.h 2015-07-15 11:10:38 UTC (rev 5913)
@@ -31,7 +31,6 @@
afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
//}}AFX_MSG
void Relocation(BOOL is_init, int WW);
- void Bringup();
DECLARE_MESSAGE_MAP()
};
typedef CInpDlg *PInpDlg;
Modified: trunk/teraterm/ttpmacro/msgdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/msgdlg.cpp 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/msgdlg.cpp 2015-07-15 11:10:38 UTC (rev 5913)
@@ -90,7 +90,7 @@
Relocation(TRUE, WW);
- Bringup();
+ BringupWindow(this->m_hWnd);
return TRUE;
}
@@ -211,23 +211,3 @@
return (CDialog::OnCommand(wParam,lParam));
}
}
-
-void CMsgDlg::Bringup()
-{
- DWORD pid;
- DWORD thisThreadId;
- DWORD fgThreadId;
-
- thisThreadId = GetWindowThreadProcessId(GetSafeHwnd(), &pid);
- fgThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
-
- if (thisThreadId == fgThreadId) {
- SetForegroundWindow();
- BringWindowToTop();
- } else {
- AttachThreadInput(thisThreadId, fgThreadId, TRUE);
- SetForegroundWindow();
- BringWindowToTop();
- AttachThreadInput(thisThreadId, fgThreadId, FALSE);
- }
-}
Modified: trunk/teraterm/ttpmacro/msgdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/msgdlg.h 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/msgdlg.h 2015-07-15 11:10:38 UTC (rev 5913)
@@ -30,6 +30,5 @@
afx_msg LONG OnExitSizeMove(UINT wParam, LONG lParam);
//}}AFX_MSG
void Relocation(BOOL is_init, int WW);
- void Bringup();
DECLARE_MESSAGE_MAP()
};
Modified: trunk/teraterm/ttpmacro/statdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/statdlg.cpp 2015-07-14 01:52:10 UTC (rev 5912)
+++ trunk/teraterm/ttpmacro/statdlg.cpp 2015-07-15 11:10:38 UTC (rev 5913)
@@ -213,22 +213,7 @@
void CStatDlg::Bringup()
{
- DWORD pid;
- DWORD thisThreadId;
- DWORD fgThreadId;
-
- thisThreadId = GetWindowThreadProcessId(GetSafeHwnd(), &pid);
- fgThreadId = GetWindowThreadProcessId(::GetForegroundWindow(), &pid);
-
- if (thisThreadId == fgThreadId) {
- SetForegroundWindow();
- BringWindowToTop();
- } else {
- AttachThreadInput(thisThreadId, fgThreadId, TRUE);
- SetForegroundWindow();
- BringWindowToTop();
- AttachThreadInput(thisThreadId, fgThreadId, FALSE);
- }
+ BringupWindow(this->m_hWnd);
}
BOOL CStatDlg::CheckAutoCenter()