From aa7d1d44373554f9df11002c6952b249e73415ec Mon Sep 17 00:00:00 2001 From: ondrej Date: Wed, 2 Mar 2016 14:51:07 +0000 Subject: [PATCH] carbon, cocoa: add WinHandle check into CheckMouseButtonDownUp in case AWinControl is nil. Issue #29769 git-svn-id: trunk@51805 - --- lcl/interfaces/carbon/carbonprivatecommon.inc | 2 +- lcl/interfaces/carbon/carbonprivatewindow.inc | 4 ++-- lcl/interfaces/cocoa/cocoawscommon.pas | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lcl/interfaces/carbon/carbonprivatecommon.inc b/lcl/interfaces/carbon/carbonprivatecommon.inc index a9e9af091f..0773096459 100644 --- a/lcl/interfaces/carbon/carbonprivatecommon.inc +++ b/lcl/interfaces/carbon/carbonprivatecommon.inc @@ -268,7 +268,7 @@ begin Msg.XPos := P.X; Msg.YPos := P.Y; Msg.Keys := GetCarbonMsgKeyState; - Msg.Msg := CheckMouseButtonDownUp(AWidget.LCLObject, LastMouse, + Msg.Msg := CheckMouseButtonDownUp(TLCLIntfHandle(AWidget), AWidget.LCLObject, LastMouse, AWidget.LCLObject.ClientToScreen(P), MouseButton, False); case LastMouse.ClickCount of 2: Msg.Keys := msg.Keys or MK_DOUBLECLICK; diff --git a/lcl/interfaces/carbon/carbonprivatewindow.inc b/lcl/interfaces/carbon/carbonprivatewindow.inc index a6523fad8c..b0be3845c4 100644 --- a/lcl/interfaces/carbon/carbonprivatewindow.inc +++ b/lcl/interfaces/carbon/carbonprivatewindow.inc @@ -146,7 +146,7 @@ const MouseButton := GetCarbonMouseButton(AEvent); MousePoint := GetMousePoint; - Msg^.Msg := CheckMouseButtonDownUp(Widget.LCLObject, LastMouse, + Msg^.Msg := CheckMouseButtonDownUp(TLCLIntfHandle(AWidget), Widget.LCLObject, LastMouse, Widget.LCLObject.ClientToScreen(MousePoint), MouseButton, True); //debugln('HandleMouseDownEvent CliCount=',dbgs(ClickCount),' MouseButton=',dbgs(MouseButton),' Pos=',dbgs(MousePoint)); @@ -180,7 +180,7 @@ const MouseButton := GetCarbonMouseButton(AEvent); MousePoint := GetMousePoint; - Msg^.Msg := CheckMouseButtonDownUp(Widget.LCLObject, LastMouse, + Msg^.Msg := CheckMouseButtonDownUp(TLCLIntfHandle(AWidget), Widget.LCLObject, LastMouse, Widget.LCLObject.ClientToScreen(MousePoint), MouseButton, False); Msg^.XPos := MousePoint.X; diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas index e013eed954..5edf4f6622 100644 --- a/lcl/interfaces/cocoa/cocoawscommon.pas +++ b/lcl/interfaces/cocoa/cocoawscommon.pas @@ -729,7 +729,7 @@ begin NSRightMouseDown, NSOtherMouseDown: begin - Msg.Msg := CheckMouseButtonDownUp(FTarget,LastMouse, + Msg.Msg := CheckMouseButtonDownUp(TLCLIntfHandle(Owner),FTarget,LastMouse, FTarget.ClientToScreen(Point(Msg.XPos, Msg.YPos)),MButton+1,True); case LastMouse.ClickCount of 2: Msg.Keys := msg.Keys or MK_DOUBLECLICK; @@ -759,7 +759,7 @@ begin NSRightMouseUp, NSOtherMouseUp: begin - Msg.Msg := CheckMouseButtonDownUp(FTarget,LastMouse, + Msg.Msg := CheckMouseButtonDownUp(TLCLIntfHandle(Owner),FTarget,LastMouse, FTarget.ClientToScreen(Point(Msg.XPos, Msg.YPos)),MButton+1,False); case LastMouse.ClickCount of 2: Msg.Keys := msg.Keys or MK_DOUBLECLICK;