Cocoa/CrossRef: Remove unit cross-references between CocoaInt and CocoaWSForms

lcl/interfaces/cocoa/cocoaint.pas

@@ -34,12 +34,12 @@ uses
   LCLPlatformDef, InterfaceBase, GraphType,
   // private
   CocoaAll, CocoaConfig, CocoaPrivate, CocoaUtils, CocoaGDIObjects, CocoaCursor,
-  cocoa_extra, CocoaWSMenus, CocoaWSForms, CocoaWindows, CocoaScrollers,
+  cocoa_extra, CocoaWSMenus, CocoaWindows, CocoaScrollers,
   CocoaWSClipboard, CocoaTextEdits, CocoaWSCommon,
   // LCL
   LMessages, LCLProc, LCLIntf, LCLType,
   Controls, Forms, Themes, Menus,
-  IntfGraphics, Graphics, CocoaWSFactory;
+  IntfGraphics, Graphics;
 
 type
 

lcl/interfaces/cocoa/cocoawscommon.pas

@@ -183,6 +183,7 @@ function EmbedInManualScrollView(AView: NSView): TCocoaManualScrollView;
 function EmbedInManualScrollHost(AView: TCocoaManualScrollView): TCocoaManualScrollHost;
 
 function HWNDToTargetObject(AFormHandle: HWND): TObject;
+function HWNDToForm(AFormHandle: HWND): TCustomForm;
 
 procedure ScrollViewSetBorderStyle(sv: NSScrollView; astyle: TBorderStyle);
 procedure UpdateFocusRing(v: NSView; astyle: TBorderStyle);
@@ -2048,6 +2049,16 @@ begin
   Result := cb.GetTarget;
 end;
 
+function HWNDToForm(AFormHandle: HWND): TCustomForm;
+var
+  obj : TObject;
+begin
+  obj := HWNDToTargetObject(AFormHandle);
+  if Assigned(obj) and (obj is TCustomForm)
+    then Result := TCustomForm(obj)
+    else Result := nil;
+end;
+
 function NSObjectDebugStr(obj: NSObject): string;
 begin
   Result := IntToStr(PtrUInt(obj));

lcl/interfaces/cocoa/cocoawsforms.pas

@@ -28,9 +28,9 @@ uses
   // LCL
   Controls, Forms, Graphics, LCLType, Messages, LMessages, LCLProc,
   // Widgetset
-  WSForms, WSLCLClasses, WSProc, LCLMessageGlue,
+  WSForms, WSLCLClasses, LCLMessageGlue,
   // LCL Cocoa
-  CocoaConfig, CocoaPrivate, CocoaUtils, CocoaWSCommon, CocoaWSStdCtrls, CocoaWSMenus,
+  CocoaInt, CocoaConfig, CocoaPrivate, CocoaUtils, CocoaWSCommon, CocoaWSMenus,
   CocoaGDIObjects,
   CocoaWindows, CocoaScrollers, cocoa_extra;
 
@@ -189,7 +189,6 @@ type
   end;
 
 procedure ArrangeTabOrder(const AWinControl: TWinControl);
-function HWNDToForm(AFormHandle: HWND): TCustomForm;
 procedure WindowSetFormStyle(win: NSWindow; AFormStyle: TFormStyle);
 
 var
@@ -198,8 +197,7 @@ var
 implementation
 
 uses
-  GraphMath,
-  CocoaInt;
+  GraphMath;
 
 const
   // The documentation is using constants like "NSNormalWindowLevel=4" for normal forms,
@@ -1209,14 +1207,4 @@ begin
   end;
 end;
 
-function HWNDToForm(AFormHandle: HWND): TCustomForm;
-var
-  obj : TObject;
-begin
-  obj := HWNDToTargetObject(AFormHandle);
-  if Assigned(obj) and (obj is TCustomForm)
-    then Result := TCustomForm(obj)
-    else Result := nil;
-end;
-
 end.

lcl/interfaces/cocoa/interfaces.pas

@@ -27,7 +27,7 @@ interface
 
 uses 
   {$IFNDEF DisableCWString}cwstring,{$ENDIF}
-  InterfaceBase;
+  InterfaceBase, CocoaWSFactory;
 
 implementation