Revision: 8148 https://osdn.net/projects/ttssh2/scm/svn/commits/8148 Author: yasuhide Date: 2019-09-14 22:13:54 +0900 (Sat, 14 Sep 2019) Log Message: ----------- TipWinの実装漏れを修正した - CTipWinのWNDCLASSをローカル変数にした - TipWinに実装が漏れていた関数を追加した - TipWinGetPos - TipWinSetVisible - TipWinIsExists Modified Paths: -------------- trunk/teraterm/common/tipwin.cpp trunk/teraterm/common/tipwin.h -------------- next part -------------- Modified: trunk/teraterm/common/tipwin.cpp =================================================================== --- trunk/teraterm/common/tipwin.cpp 2019-09-14 11:11:21 UTC (rev 8147) +++ trunk/teraterm/common/tipwin.cpp 2019-09-14 13:13:54 UTC (rev 8148) @@ -227,6 +227,7 @@ const UINT uDpi = GetMonitorDpiFromWindow(src); if (!tip_class) { + WNDCLASS wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0; @@ -399,6 +400,14 @@ DeleteObject(tip_font); } +void TipWinGetPos(TipWin *tWin, int *x, int *y) +{ + CTipWin* tipwin = (CTipWin*) tWin; + POINT pt = tipwin->GetPos(); + *x = (int)pt.x; + *y = (int)pt.y; +} + void TipWinSetPos(TipWin *tWin, int x, int y) { CTipWin* tipwin = (CTipWin*) tWin; @@ -411,6 +420,12 @@ tipwin->SetText(str); } +void TipWinSetHideTimer(TipWin *tWin, int ms) +{ + CTipWin* tipwin = (CTipWin*) tWin; + tipwin->SetHideTimer(ms); +} + void TipWinDestroy(TipWin* tWin) { CTipWin* tipwin = (CTipWin*) tWin; @@ -417,6 +432,12 @@ tipwin->Destroy(); } +int TipWinIsExists(TipWin *tWin) +{ + CTipWin* tipwin = (CTipWin*) tWin; + return (int)tipwin->IsExists(); +} + void TipWinSetVisible(TipWin* tWin, int bVisible) { CTipWin* tipwin = (CTipWin*) tWin; Modified: trunk/teraterm/common/tipwin.h =================================================================== --- trunk/teraterm/common/tipwin.h 2019-09-14 11:11:21 UTC (rev 8147) +++ trunk/teraterm/common/tipwin.h 2019-09-14 13:13:54 UTC (rev 8148) @@ -15,10 +15,11 @@ void TipWinSetText(TipWin *tWin, TCHAR *text); void TipWinDestroy(TipWin *tWin); void TipWinGetTextWidthHeight(HWND src, const TCHAR *str, int *width, int *height); +void TipWinGetPos(TipWin *tWin, int *x, int *y); void TipWinSetPos(TipWin *tWin, int x, int y); -void TipWinSetShow(TipWin *tWin); -void TipWinSetHide(TipWin *tWin); void TipWinSetHideTimer(TipWin *tWin, int ms); +void TipWinSetVisible(TipWin *tWin, int visible); +int TipWinIsExists(TipWin *tWin); int TipWinIsVisible(TipWin *tWin); #ifdef __cplusplus @@ -46,7 +47,6 @@ POINT pts; UINT timerid; TipWin* tWin; - WNDCLASS wc; static ATOM tip_class; static LRESULT CALLBACK WndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam); VOID CalcStrRect(VOID);