paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-15 23:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: adding RemoveTarget method to callback. To let it know that the target handle has been destroyed

Browse Source 
git-svn-id: trunk@61425 -
This commit is contained in:
dmitry 2019-06-19 14:49:31 +00:00
parent 860c292e15
commit 8f2808bb2e
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/cocoa/cocoaprivate.pas
View File

@ -113,6 +113,12 @@ type
function GetIsOpaque: Boolean;
procedure SetIsOpaque(AValue: Boolean);
function GetShouldBeEnabled: Boolean;
// the method is called, when handle is being destroyed.
// the callback object to stay alive a little longer than LCL object (Target)
// thus it needs to know that LCL object has been destroyed.
// After this called has been removed, any Cocoa events should not be
// forwarded to LCL target
procedure RemoveTarget;
// properties
property HasCaret: Boolean read GetHasCaret write SetHasCaret;

21
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -97,6 +97,7 @@ type
procedure DrawBackground(ctx: NSGraphicsContext; const bounds, dirtyRect: NSRect); virtual;
procedure DrawOverlay(ControlContext: NSGraphicsContext; const bounds, dirty: NSRect); virtual;
function ResetCursorRects: Boolean; virtual;
procedure RemoveTarget; virtual;
property HasCaret: Boolean read GetHasCaret write SetHasCaret;
property Target: TWinControl read FTarget;
@ -443,7 +444,8 @@ end;
{ If a window does not display a shortcut menu it should pass
this message to the DefWindowProc function. If a window is
a child window, DefWindowProc sends the message to the parent. }
procedure TLCLCommonCallback.SendContextMenu(event: NSEvent; out ContextMenuHandled: Boolean);
procedure TLCLCommonCallback.SendContextMenu(Event: NSEvent; out
ContextMenuHandled: Boolean);
var
MsgContext: TLMContextMenu;
MousePos : NSPoint;
@ -1175,28 +1177,33 @@ end;
procedure TLCLCommonCallback.ResignFirstResponder;
begin
if not Assigned(Target) then Exit;
LCLSendKillFocusMsg(Target);
end;
procedure TLCLCommonCallback.DidBecomeKeyNotification;
begin
if not Assigned(Target) then Exit;
LCLSendActivateMsg(Target, WA_ACTIVE, false);
LCLSendSetFocusMsg(Target);
end;
procedure TLCLCommonCallback.DidResignKeyNotification;
begin
if not Assigned(Target) then Exit;
LCLSendActivateMsg(Target, WA_INACTIVE, false);
LCLSendKillFocusMsg(Target);
end;
procedure TLCLCommonCallback.SendOnChange;
begin
if not Assigned(Target) then Exit;
SendSimpleMessage(Target, LM_CHANGED);
end;
procedure TLCLCommonCallback.SendOnTextChanged;
begin
if not Assigned(Target) then Exit;
SendSimpleMessage(Target, CM_TEXTCHANGED);
end;
@ -1222,7 +1229,10 @@ end;
function TLCLCommonCallback.DeliverMessage(var Msg): LRESULT;
begin
Result := LCLMessageGlue.DeliverMessage(Target, Msg);
if Assigned(Target) then
Result := LCLMessageGlue.DeliverMessage(Target, Msg)
else
Result := 0;
end;
function TLCLCommonCallback.DeliverMessage(Msg: Cardinal; WParam: WParam; LParam: LParam): LResult;
@ -1325,6 +1335,7 @@ begin
Result := False;
View := CocoaUtils.GetNSObjectView(Owner);
if View = nil then Exit;
if not Assigned(Target) then Exit;
if not (csDesigning in Target.ComponentState) then
begin
ACursor := Screen.Cursor;
@ -1343,6 +1354,11 @@ begin
end;
end;
procedure TLCLCommonCallback.RemoveTarget;
begin
FTarget := nil;
end;
function TLCLCommonCallback.GetIsOpaque: Boolean;
begin
Result:= FIsOpaque;
@ -1404,6 +1420,7 @@ begin
begin
if Callback.HasCaret then DestroyCaret(nil);
CallbackObject := Callback.GetCallbackObject;
Callback.RemoveTarget;
Callback := nil;
obj.lclClearCallback;
// Do not free the callback object here. It might be processing an event