Tera TermRevision: 8680
https://osdn.net/projects/ttssh2/scm/svn/commits/8680
Author: zmatsuo
Date: 2020-04-11 01:33:09 +0900 (Sat, 11 Apr 2020)
Log Message:
-----------
IME 前後参照変換がうまく動作していなかった
- r8526
- OnMouseActivate() の戻り値を int から LRESULT に変更
MTF: r8677
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8526
https://osdn.net/projects/ttssh2/scm/svn/commits/8677
Modified Paths:
--------------
branches/4-stable/teraterm/teraterm/vtwin.cpp
branches/4-stable/teraterm/teraterm/vtwin.h
-------------- next part --------------
Modified: branches/4-stable/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/4-stable/teraterm/teraterm/vtwin.cpp 2020-04-08 16:01:33 UTC (rev 8679)
+++ branches/4-stable/teraterm/teraterm/vtwin.cpp 2020-04-10 16:33:09 UTC (rev 8680)
@@ -2408,7 +2408,7 @@
}
}
-int CVTWindow::OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message)
+LRESULT CVTWindow::OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message)
{
if ((ts.SelOnActive==0) && (nHitTest==HTCLIENT)) { //disable mouse event for text selection
IgnoreRelease = TRUE;
@@ -6502,7 +6502,7 @@
OnIMENotify(wp, lp);
break;
case WM_IME_REQUEST:
- OnIMERequest(wp, lp);
+ retval = OnIMERequest(wp, lp);
break;
case WM_WINDOWPOSCHANGING:
OnWindowPosChanging(wp, lp);
Modified: branches/4-stable/teraterm/teraterm/vtwin.h
===================================================================
--- branches/4-stable/teraterm/teraterm/vtwin.h 2020-04-08 16:01:33 UTC (rev 8679)
+++ branches/4-stable/teraterm/teraterm/vtwin.h 2020-04-10 16:33:09 UTC (rev 8680)
@@ -103,7 +103,7 @@
void OnLButtonUp(WPARAM nFlags, POINTS point);
void OnMButtonDown(WPARAM nFlags, POINTS point);
void OnMButtonUp(WPARAM nFlags, POINTS point);
- int OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message);
+ LRESULT OnMouseActivate(HWND pDesktopWnd, UINT nHitTest, UINT message);
void OnMouseMove(WPARAM nFlags, POINTS point);
void OnMove(int x, int y);
BOOL OnMouseWheel(UINT nFlags, short zDelta, POINTS pt);