Merge branch 'main' into refactor-remove-nativehost-target

# Conflicts:
#	AppKit/CPTextView/_CPTableTextAttachment.j

AppKit/CPTextView/CPFontPanel.j

@@ -36,6 +36,7 @@
 @class CPLayoutManager
 @class CPTextContainer
 @class CPFontManager
+@class _CPFontPanelPreviewView
 
 /*
     Collection indexes

AppKit/CPTextView/CPParagraphStyle.j

@@ -26,7 +26,7 @@
 
 CPParagraphStyleAttributeName = @"CPParagraphStyleAttributeName";
 
-// Define missing global tab stop type constants
+@typedef CPTabStopType
 CPLeftTabStopType = 0;
 CPRightTabStopType = 1;
 CPCenterTabStopType = 2;

AppKit/CPTextView/CPRulerView.j

@@ -29,13 +29,15 @@
 @import "CPMenuItem.j"
 
 // Orientations matching AppKit standards
-// typedef enum CPRulerOrientation
-CPHorizontalRuler = 0,
-CPVerticalRuler = 1,
-CPRulerOrientationHorizontal = 0,
-CPRulerOrientationVertical = 1
+@typedef CPRulerOrientation
+CPHorizontalRuler = 0;
+CPVerticalRuler = 1;
+CPRulerOrientationHorizontal = 0;
+CPRulerOrientationVertical = 1;
 
 @class CPRulerView;
+@class CPScrollView;
+@class CPTextTab;
 
 
 // MARK: - CPRulerMarker (Interactive Handles with Dynamic Alignment Icons)

AppKit/CPTextView/_CPTableTextAttachment.j

@@ -19,11 +19,11 @@
  */
 
 @import "CPView.j"
+@class CPTextView;
+@class CPTextContainer;
 @import "CPTextField.j"
 @import <Foundation/CPAttributedString.j>
 
-@class CPTextView;
-
 @implementation _CPTableTextAttachment : CPView
 {
     CPArray _headers;