From 826363365c661f8a73a75b8780918d04aed2c0b2 Mon Sep 17 00:00:00 2001
From: Yoh Deadfall <yoh.deadfall@hotmail.com>
Date: Wed, 12 Apr 2023 18:07:25 +0300
Subject: [PATCH 1/2] Removed unreferenced resources from TextBox

---
 src/Avalonia.Themes.Fluent/Controls/TextBox.xaml | 8 +-------
 src/Avalonia.Themes.Simple/Controls/TextBox.xaml | 9 ---------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
index c6da9f72a3..2d7d6fa9b3 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <Design.PreviewWith>
     <Border Padding="20">
@@ -26,12 +26,6 @@
     <MenuItem x:Name="TextBoxContextFlyoutPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
   </MenuFlyout>
 
-  <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}"/>
-    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}" IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}"/>
-  </ContextMenu>
-
   <ControlTheme x:Key="FluentTextBoxButton" TargetType="Button">
     <Setter Property="Background" Value="{DynamicResource TextControlButtonBackground}" />
     <Setter Property="BorderBrush" Value="{DynamicResource TextControlButtonBorderBrush}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
index 8428e3aae7..632bc58fc0 100644
--- a/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TextBox.xaml
@@ -13,15 +13,6 @@
               IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
   </MenuFlyout>
 
-  <ContextMenu x:Key="SimpleTextBoxContextMenu" 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}" />
-    <MenuItem x:Name="TextBoxContextMenuPasteItem" Header="Paste" Command="{Binding $parent[TextBox].Paste}"
-              IsEnabled="{Binding $parent[TextBox].CanPaste}" InputGesture="{x:Static TextBox.PasteGesture}" />
-  </ContextMenu>
-
   <ControlTheme x:Key="SimpleTextBoxClearButtonTheme"
                 BasedOn="{StaticResource {x:Type Button}}"
                 TargetType="Button">

From 63f3a9a58e3efe347605601c459a0899b3dd3f7c Mon Sep 17 00:00:00 2001
From: Tom Edwards <t.edwards@enscape3d.com>
Date: Sat, 15 Apr 2023 13:37:36 +0200
Subject: [PATCH 2/2] Use SetCurrentValue to manipulate sibling RadioButtons

---
 src/Avalonia.Controls/RadioButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/RadioButton.cs b/src/Avalonia.Controls/RadioButton.cs
index d4528fdb1c..f48ae72312 100644
--- a/src/Avalonia.Controls/RadioButton.cs
+++ b/src/Avalonia.Controls/RadioButton.cs
@@ -86,7 +86,7 @@ namespace Avalonia.Controls
                                 continue;
                             }
                             if (current != radioButton && current.IsChecked.GetValueOrDefault())
-                                current.IsChecked = false;
+                                current.SetCurrentValue(IsCheckedProperty, false);
                             i++;
                         }
                         if (group.Count == 0)
@@ -193,7 +193,7 @@ namespace Avalonia.Controls
                     foreach (var sibling in siblings)
                     {
                         if (sibling.IsChecked.GetValueOrDefault())
-                            sibling.IsChecked = false;
+                            sibling.SetCurrentValue(IsCheckedProperty, false);
                     }
                 }
             }