Changeset 674 for trunk/ab5.0

Timestamp:

Jan 12, 2009, 1:56:33 PM (16 years ago)

Author:

NoWest

Message:

チケット1 #198 の問題でマウスイベントが正常に動きませんので、
暫定的に変換プログラムを挿入しました。

File:

• trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Control.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Control.ab

@@ -217 +217 @@
         Dim wp = e.WParam
         Dim lp = e.LParam
-        makeMouseEventFromMsg = New MouseArgs(LOWORD(wp) As MouseButtons, 1, GET_X_LPARAM(lp), GET_Y_LPARAM(lp), 0)
+
+        /*************************************************/
+        Dim mb As MouseButtons
+        If LOWORD(wp) = 0 Then mb = MouseButtons.None
+        If LOWORD(wp) and MK_LBUTTON Then mb or = MouseButtons.Left
+        If LOWORD(wp) and MK_RBUTTON Then mb or = MouseButtons.Right
+        If LOWORD(wp) and MK_MBUTTON Then mb or = MouseButtons.Middle
+        If LOWORD(wp) and MK_XBUTTON1 Then mb or = MouseButtons.XButton1
+        If LOWORD(wp) and MK_XBUTTON2 Then mb or = MouseButtons.XButton2
+        If LOWORD(wp) and MK_SHIFT Then mb or = MouseButtons.Shift
+        If LOWORD(wp) and MK_CONTROL Then mb or = MouseButtons.Control
+        makeMouseEventFromMsg = New MouseArgs(mb, 1, GET_X_LPARAM(lp), GET_Y_LPARAM(lp), 0)
+        /*************************************************/
+
+        'makeMouseEventFromMsg = New MouseArgs(LOWORD(wp) As MouseButtons, 1, GET_X_LPARAM(lp), GET_Y_LPARAM(lp), 0)
     End Function