Tera TermRevision: 8677
https://osdn.net/projects/ttssh2/scm/svn/commits/8677
Author: zmatsuo
Date: 2020-04-09 01:01:12 +0900 (Thu, 09 Apr 2020)
Log Message:
-----------
IME 前後参照変換がうまく動作していなかった
- r8526
- OnMouseActivate() の戻り値を int から LRESULT に変更
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8526
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/teraterm/vtwin.h
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2020-04-08 16:01:02 UTC (rev 8676)
+++ trunk/teraterm/teraterm/vtwin.cpp 2020-04-08 16:01:12 UTC (rev 8677)
@@ -2300,7 +2300,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;
@@ -6457,7 +6457,7 @@
OnIMENotify(wp, lp);
break;
case WM_IME_REQUEST:
- OnIMERequest(wp, lp);
+ retval = OnIMERequest(wp, lp);
break;
case WM_WINDOWPOSCHANGING:
OnWindowPosChanging(wp, lp);
Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h 2020-04-08 16:01:02 UTC (rev 8676)
+++ trunk/teraterm/teraterm/vtwin.h 2020-04-08 16:01:12 UTC (rev 8677)
@@ -113,7 +113,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);