Remove presenter interfaces

src/Avalonia.Controls/ContentControl.cs

@@ -13,7 +13,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Displays <see cref="Content"/> according to an <see cref="IDataTemplate"/>.
     /// </summary>
-    [TemplatePart("PART_ContentPresenter", typeof(IContentPresenter))]
+    [TemplatePart("PART_ContentPresenter", typeof(ContentPresenter))]
     public class ContentControl : TemplatedControl, IContentControl, IContentPresenterHost
     {
         /// <summary>
@@ -68,7 +68,7 @@ public IDataTemplate? ContentTemplate
         /// <summary>
         /// Gets the presenter from the control's template.
         /// </summary>
-        public IContentPresenter? Presenter
+        public ContentPresenter? Presenter
         {
             get;
             private set;
@@ -96,16 +96,16 @@ public VerticalAlignment VerticalContentAlignment
         IAvaloniaList<ILogical> IContentPresenterHost.LogicalChildren => LogicalChildren;
 
         /// <inheritdoc/>
-        bool IContentPresenterHost.RegisterContentPresenter(IContentPresenter presenter)
+        bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
             return RegisterContentPresenter(presenter);
         }
 
         /// <summary>
-        /// Called when an <see cref="IContentPresenter"/> is registered with the control.
+        /// Called when an <see cref="ContentPresenter"/> is registered with the control.
         /// </summary>
         /// <param name="presenter">The presenter.</param>
-        protected virtual bool RegisterContentPresenter(IContentPresenter presenter)
+        protected virtual bool RegisterContentPresenter(ContentPresenter presenter)
         {
             if (presenter.Name == "PART_ContentPresenter")
             {

src/Avalonia.Controls/Presenters/ContentPresenter.cs

@@ -17,7 +17,7 @@ namespace Avalonia.Controls.Presenters
     /// Presents a single item of data inside a <see cref="TemplatedControl"/> template.
     /// </summary>
     [PseudoClasses(":empty")]
-    public class ContentPresenter : Control, IContentPresenter
+    public class ContentPresenter : Control
     {
         /// <summary>
         /// Defines the <see cref="Background"/> property.

src/Avalonia.Controls/Presenters/IContentPresenterHost.cs

@@ -22,13 +22,13 @@ internal interface IContentPresenterHost
         IAvaloniaList<ILogical> LogicalChildren { get; }
 
         /// <summary>
-        /// Registers an <see cref="IContentPresenter"/> with a host control.
+        /// Registers an <see cref="ContentPresenter"/> with a host control.
         /// </summary>
         /// <param name="presenter">The content presenter.</param>
         /// <returns>
         /// True if the content presenter should add its child to the logical children of the
         /// host; otherwise false.
         /// </returns>
-        bool RegisterContentPresenter(IContentPresenter presenter);
+        bool RegisterContentPresenter(ContentPresenter presenter);
     }
 }

src/Avalonia.Controls/Presenters/ScrollContentPresenter.cs

@@ -13,7 +13,7 @@ namespace Avalonia.Controls.Presenters
     /// <summary>
     /// Presents a scrolling view of content inside a <see cref="ScrollViewer"/>.
     /// </summary>
-    public class ScrollContentPresenter : ContentPresenter, IPresenter, IScrollable, IScrollAnchorProvider
+    public class ScrollContentPresenter : ContentPresenter, IScrollable, IScrollAnchorProvider
     {
         private const double EdgeDetectionTolerance = 0.1;
 

src/Avalonia.Controls/Primitives/HeaderedContentControl.cs

@@ -41,7 +41,7 @@ public object? Header
         /// <summary>
         /// Gets the header presenter from the control's template.
         /// </summary>
-        public IContentPresenter? HeaderPresenter
+        public ContentPresenter? HeaderPresenter
         {
             get;
             private set;
@@ -57,7 +57,7 @@ public IDataTemplate? HeaderTemplate
         }
 
         /// <inheritdoc/>
-        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        protected override bool RegisterContentPresenter(ContentPresenter presenter)
         {
             var result = base.RegisterContentPresenter(presenter);
 

src/Avalonia.Controls/Primitives/HeaderedItemsControl.cs

@@ -56,7 +56,7 @@ public IDataTemplate? HeaderTemplate
         /// <summary>
         /// Gets the header presenter from the control's template.
         /// </summary>
-        public IContentPresenter? HeaderPresenter
+        public ContentPresenter? HeaderPresenter
         {
             get;
             private set;
@@ -77,16 +77,16 @@ protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e
         }
 
         /// <inheritdoc/>
-        bool IContentPresenterHost.RegisterContentPresenter(IContentPresenter presenter)
+        bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
             return RegisterContentPresenter(presenter);
         }
 
         /// <summary>
-        /// Called when an <see cref="IContentPresenter"/> is registered with the control.
+        /// Called when an <see cref="ContentPresenter"/> is registered with the control.
         /// </summary>
         /// <param name="presenter">The presenter.</param>
-        protected virtual bool RegisterContentPresenter(IContentPresenter presenter)
+        protected virtual bool RegisterContentPresenter(ContentPresenter presenter)
         {
             if (presenter.Name == "PART_HeaderPresenter")
             {

src/Avalonia.Controls/Primitives/HeaderedSelectingItemsControl.cs

@@ -56,7 +56,7 @@ public IDataTemplate? HeaderTemplate
         /// <summary>
         /// Gets the header presenter from the control's template.
         /// </summary>
-        public IContentPresenter? HeaderPresenter
+        public ContentPresenter? HeaderPresenter
         {
             get;
             private set;
@@ -66,7 +66,7 @@ public IContentPresenter? HeaderPresenter
         IAvaloniaList<ILogical> IContentPresenterHost.LogicalChildren => LogicalChildren;
 
         /// <inheritdoc/>
-        bool IContentPresenterHost.RegisterContentPresenter(IContentPresenter presenter)
+        bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
             return RegisterContentPresenter(presenter);
         }
@@ -83,10 +83,10 @@ protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e
         }
 
         /// <summary>
-        /// Called when an <see cref="IContentPresenter"/> is registered with the control.
+        /// Called when an <see cref="ContentPresenter"/> is registered with the control.
         /// </summary>
         /// <param name="presenter">The presenter.</param>
-        protected virtual bool RegisterContentPresenter(IContentPresenter presenter)
+        protected virtual bool RegisterContentPresenter(ContentPresenter presenter)
         {
             if (presenter.Name == "PART_HeaderPresenter")
             {

src/Avalonia.Controls/Primitives/IPopupHost.cs

@@ -52,7 +52,7 @@ public interface IPopupHost : IDisposable, IFocusScope
         /// <summary>
         /// Gets the presenter from the control's template.
         /// </summary>
-        IContentPresenter? Presenter { get; }
+        ContentPresenter? Presenter { get; }
 
         /// <summary>
         /// Gets or sets whether the popup appears on top of all other windows.

src/Avalonia.Controls/ScrollViewer.cs

@@ -644,7 +644,7 @@ public void UnregisterAnchorCandidate(Control element)
             (Presenter as IScrollAnchorProvider)?.UnregisterAnchorCandidate(element);
         }
 
-        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        protected override bool RegisterContentPresenter(ContentPresenter presenter)
         {
             _childSubscription?.Dispose();
             _childSubscription = null;

src/Avalonia.Controls/SplitView/SplitView.cs

@@ -279,7 +279,7 @@ public event EventHandler<CancelRoutedEventArgs>? PaneOpening
             remove => RemoveHandler(PaneOpeningEvent, value);
         }
 
-        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        protected override bool RegisterContentPresenter(ContentPresenter presenter)
         {
             var result = base.RegisterContentPresenter(presenter);
 

src/Avalonia.Controls/TabControl.cs

@@ -140,13 +140,13 @@ public IDataTemplate? SelectedContentTemplate
 
         internal ItemsPresenter? ItemsPresenterPart { get; private set; }
 
-        internal IContentPresenter? ContentPart { get; private set; }
+        internal ContentPresenter? ContentPart { get; private set; }
 
         /// <inheritdoc/>
         IAvaloniaList<ILogical> IContentPresenterHost.LogicalChildren => LogicalChildren;
 
         /// <inheritdoc/>
-        bool IContentPresenterHost.RegisterContentPresenter(IContentPresenter presenter)
+        bool IContentPresenterHost.RegisterContentPresenter(ContentPresenter presenter)
         {
             return RegisterContentPresenter(presenter);
         }
@@ -210,10 +210,10 @@ private void UpdateSelectedContent(Control? container = null)
         }
 
         /// <summary>
-        /// Called when an <see cref="IContentPresenter"/> is registered with the control.
+        /// Called when an <see cref="ContentPresenter"/> is registered with the control.
         /// </summary>
         /// <param name="presenter">The presenter.</param>
-        protected virtual bool RegisterContentPresenter(IContentPresenter presenter)
+        protected virtual bool RegisterContentPresenter(ContentPresenter presenter)
         {
             if (presenter.Name == "PART_SelectedContentHost")
             {

src/Avalonia.Controls/ToggleSwitch.cs

@@ -86,13 +86,13 @@ public object? OffContent
             set { SetValue(OffContentProperty, value); }
         }
 
-        public IContentPresenter? OffContentPresenter
+        public ContentPresenter? OffContentPresenter
         {
             get;
             private set;
         }
 
-        public IContentPresenter? OnContentPresenter
+        public ContentPresenter? OnContentPresenter
         {
             get;
             private set;
@@ -142,7 +142,7 @@ private void OnContentChanged(AvaloniaPropertyChangedEventArgs e)
             }
         }
 
-        protected override bool RegisterContentPresenter(IContentPresenter presenter)
+        protected override bool RegisterContentPresenter(ContentPresenter presenter)
         {
             var result = base.RegisterContentPresenter(presenter);
 

src/Avalonia.Controls/TransitioningContentControl.cs

@@ -71,7 +71,7 @@ PageTransition is { } transition &&
         return result;
     }
 
-    protected override bool RegisterContentPresenter(IContentPresenter presenter)
+    protected override bool RegisterContentPresenter(ContentPresenter presenter)
     {
         if (!base.RegisterContentPresenter(presenter) &&
             presenter is ContentPresenter p &&