Merge pull request #5822 from AvaloniaUI/fixes/do-not-obsolete-contex…

…t-menu-api dont obsolete context menu apis.
AvaloniaUI · Apr 21, 2021 · 9794354 · 9794354
2 parents 222860c + ab1bf41
commit 9794354
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
@@ -37,7 +37,6 @@ public class Control : InputElement, IControl, INamed, IVisualBrushInitialize, I
         /// <summary>
         /// Defines the <see cref="ContextMenu"/> property.
         /// </summary>
-        [Obsolete("Prefer ContextFlyout")]
         public static readonly StyledProperty<ContextMenu?> ContextMenuProperty =
             AvaloniaProperty.Register<Control, ContextMenu?>(nameof(ContextMenu));
 
@@ -77,7 +76,6 @@ public class Control : InputElement, IControl, INamed, IVisualBrushInitialize, I
         /// <summary>
         /// Gets or sets a context menu to the control.
         /// </summary>
-        [Obsolete("Prefer ContextFlyout")]
         public ContextMenu? ContextMenu
         {
             get => GetValue(ContextMenuProperty);

diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -10,7 +10,6 @@
       <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
     </MenuFlyout>
 
-    <!-- ContextMenu obsolete, prefer ContextFlyout --> 
     <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
       <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>

diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -21,7 +21,6 @@
       <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
     </MenuFlyout>
 
-    <!-- ContextMenu obsolete, prefer ContextFlyout -->
     <ContextMenu x:Key="DefaultTextBoxContextMenu" x:Name="TextBoxContextMenu">
       <MenuItem x:Name="TextBoxContextMenuCutItem" Header="Cut" Command="{Binding $parent[TextBox].Cut}" IsEnabled="{Binding $parent[TextBox].CanCut}" InputGesture="{x:Static TextBox.CutGesture}" />
       <MenuItem x:Name="TextBoxContextMenuCopyItem" Header="Copy" Command="{Binding $parent[TextBox].Copy}" IsEnabled="{Binding $parent[TextBox].CanCopy}" InputGesture="{x:Static TextBox.CopyGesture}"/>