From 1c81206a45f5e7c4778b7a344fffaa1c66529ce1 Mon Sep 17 00:00:00 2001
From: rich2014 <rich2014.git@outlook.com>
Date: Sun, 10 Nov 2024 11:59:31 +0800
Subject: [PATCH] Cocoa: remove circle references between CocoaInt and
 CocoaWSCommon

---
 lcl/interfaces/cocoa/cocoacallback.pas   |  2 ++
 lcl/interfaces/cocoa/cocoaint.pas        |  2 +-
 lcl/interfaces/cocoa/cocoawinapi.inc     | 23 ++++++++++-------------
 lcl/interfaces/cocoa/cocoawscommon.pas   | 23 ++++++++++++++++++-----
 lcl/interfaces/cocoa/cocoawsstdctrls.pas |  2 +-
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoacallback.pas b/lcl/interfaces/cocoa/cocoacallback.pas
index 187e8ddc53..9770d3d141 100644
--- a/lcl/interfaces/cocoa/cocoacallback.pas
+++ b/lcl/interfaces/cocoa/cocoacallback.pas
@@ -82,6 +82,8 @@ type
 
     procedure InputClientInsertText(const utf8: string);
 
+    function HandleFrame: NSView;
+
     // properties
     property HasCaret: Boolean read GetHasCaret write SetHasCaret;
     property IsOpaque: Boolean read GetIsOpaque write SetIsOpaque;
diff --git a/lcl/interfaces/cocoa/cocoaint.pas b/lcl/interfaces/cocoa/cocoaint.pas
index dd842f92c0..a4da1768eb 100644
--- a/lcl/interfaces/cocoa/cocoaint.pas
+++ b/lcl/interfaces/cocoa/cocoaint.pas
@@ -278,7 +278,7 @@ implementation
 
 uses
   dl,dynlibs,
-  CocoaWSCommon, CocoaCaret, CocoaThemes;
+  CocoaCaret, CocoaThemes;
 
 const
   // Lack of documentation, provisional definition
diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc
index 8c37c8e283..56a57397e8 100644
--- a/lcl/interfaces/cocoa/cocoawinapi.inc
+++ b/lcl/interfaces/cocoa/cocoawinapi.inc
@@ -1517,21 +1517,18 @@ end;
 
 function TCocoaWidgetSet.IsWindow(handle: HWND): boolean;
 var
-  cbi : ICommonCallback;
-  obj : TObject;
+  cb: ICommonCallback;
 begin
-  if handle <> 0 then
-  begin
-    cbi := NSObject(handle).lclGetCallback;
-    Result := Assigned(cbi);
-    if not Result then Exit;
+  Result:= False;
 
-    obj := cbi.GetCallbackObject;
-    Result :=  (obj is TLCLCommonCallback)
-       and (HWND(TLCLCommonCallback(obj).HandleFrame)=handle);
-  end
-  else
-    Result := False;
+  if handle = 0 then
+    Exit;
+
+  cb:= NSObject(handle).lclGetCallback;
+  if NOT Assigned(cb) then
+    Exit;
+
+  Result:= ( HWND(cb.HandleFrame) = handle );
 end;
 
 function TCocoaWidgetSet.WindowFromPoint(Point: TPoint): HWND;
diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas
index fab503f094..85618cf2cd 100644
--- a/lcl/interfaces/cocoa/cocoawscommon.pas
+++ b/lcl/interfaces/cocoa/cocoawscommon.pas
@@ -45,6 +45,7 @@ type
     _isCocoaOnlyState: Boolean;
     _UTF8Character : array [0..7] of TUTF8Char;
     _UTF8Charcount : Integer;
+    _handleFrame: NSView; // HWND and "frame" (rectangle) of the a control
   private
     procedure send_UTF8KeyPress();
     procedure send_CN_CHAR_Message();
@@ -60,7 +61,6 @@ type
     procedure KeyEvPrepare(Event: NSEvent); virtual;
   public
     Owner: NSObject;
-    HandleFrame: NSView; // HWND and "frame" (rectangle) of the a control
     BlockCocoaUpDown: Boolean;
     BlockCocoaKeyBeep: Boolean;
     BlockCocoaMouseMove: Boolean;
@@ -113,6 +113,9 @@ type
 
     procedure InputClientInsertText(const utf8: string);
 
+    function HandleFrame: NSView;
+    procedure SetHandleFrame( AHandleFrame: NSView );
+
     property HasCaret: Boolean read GetHasCaret write SetHasCaret;
     property Target: TWinControl read FTarget;
     property IsOpaque: Boolean read GetIsOpaque write SetIsOpaque;
@@ -398,9 +401,9 @@ begin
   inherited Create;
   Owner := AOwner;
   if Assigned(AHandleFrame) then
-    HandleFrame := AHandleFrame
+    _handleFrame := AHandleFrame
   else if Owner.isKindOfClass(NSView) then
-    HandleFrame := NSView(AOwner);
+    _handleFrame := NSView(AOwner);
   FTarget := ATarget;
   FContext := nil;
   FHasCaret := False;
@@ -476,7 +479,7 @@ begin
   ContextMenuHandled := false;
   FillChar(MsgContext, SizeOf(MsgContext), #0);
   MsgContext.Msg := LM_CONTEXTMENU;
-  MsgContext.hWnd := HWND(HandleFrame);
+  MsgContext.hWnd := HWND(_handleFrame);
   MousePos := Event.locationInWindow;
   ScreenMousePos(MousePos);
   MsgContext.XPos := Round(MousePos.X);
@@ -1557,6 +1560,16 @@ begin
 
 end;
 
+function TLCLCommonCallback.HandleFrame: NSView;
+begin
+  Result:= _handleFrame;
+end;
+
+procedure TLCLCommonCallback.SetHandleFrame(AHandleFrame: NSView);
+begin
+  _handleFrame:= AHandleFrame;
+end;
+
 function TLCLCommonCallback.GetIsOpaque: Boolean;
 begin
   Result:= FIsOpaque;
@@ -2035,7 +2048,7 @@ begin
 
   hs := EmbedInManualScrollHost(sl);
   hs.callback := ctrl.callback;
-  lcl.HandleFrame:=hs;
+  lcl.SetHandleFrame(hs);
 
   ScrollViewSetBorderStyle(hs, TCustomControl(AWinControl).BorderStyle );
 
diff --git a/lcl/interfaces/cocoa/cocoawsstdctrls.pas b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
index e4a0398c8a..b63d9962bf 100644
--- a/lcl/interfaces/cocoa/cocoawsstdctrls.pas
+++ b/lcl/interfaces/cocoa/cocoawsstdctrls.pas
@@ -2565,7 +2565,7 @@ begin
     Result := 0;
     Exit;
   end;
-  cb.HandleFrame := scroll;
+  cb.SetHandleFrame(scroll);
   scroll.callback := list.callback;
   scroll.setHasVerticalScroller(true);
   scroll.setHasHorizontalScroller(true);