From a6234da33409d948a9080ea002a109308b28417a Mon Sep 17 00:00:00 2001
From: BDisp <bd.bdisp@gmail.com>
Date: Wed, 9 Oct 2024 12:40:47 +0100
Subject: [PATCH] Fix merge errors.

---
 Terminal.Gui/Views/ColorPicker.Prompt.cs | 8 ++++----
 Terminal.Gui/Views/TextView.cs           | 2 +-
 UnitTests/Views/TextViewTests.cs         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Terminal.Gui/Views/ColorPicker.Prompt.cs b/Terminal.Gui/Views/ColorPicker.Prompt.cs
index 95798899a..3f2372db9 100644
--- a/Terminal.Gui/Views/ColorPicker.Prompt.cs
+++ b/Terminal.Gui/Views/ColorPicker.Prompt.cs
@@ -31,10 +31,10 @@ public partial class ColorPicker
             IsDefault = true
         };
 
-        btnOk.Accept += (s, e) =>
+        btnOk.Accepting += (s, e) =>
                         {
                             accept = true;
-                            e.Handled = true;
+                            e.Cancel = true;
                             Application.RequestStop ();
                         };
 
@@ -46,9 +46,9 @@ public partial class ColorPicker
             Width = Dim.Auto ()
         };
 
-        btnCancel.Accept += (s, e) =>
+        btnCancel.Accepting += (s, e) =>
                             {
-                                e.Handled = true;
+                                e.Cancel = true;
                                 Application.RequestStop ();
                             };
 
diff --git a/Terminal.Gui/Views/TextView.cs b/Terminal.Gui/Views/TextView.cs
index 3ee5455bb..c34e9220b 100644
--- a/Terminal.Gui/Views/TextView.cs
+++ b/Terminal.Gui/Views/TextView.cs
@@ -2859,7 +2859,7 @@ public class TextView : View
             }
 
             GetSelectedRegion ();
-            Selecting = false;
+            IsSelecting = false;
 
             _historyText.Add (
                               [.. selectedCellsOriginal],
diff --git a/UnitTests/Views/TextViewTests.cs b/UnitTests/Views/TextViewTests.cs
index 853f38643..a05af9ef0 100644
--- a/UnitTests/Views/TextViewTests.cs
+++ b/UnitTests/Views/TextViewTests.cs
@@ -8954,7 +8954,7 @@ Error   ";
         tv.SelectionStartRow = 0;
         Assert.Equal ($"TopLevel{Environment.NewLine}Base{Environment.NewLine}Dialog", tv.SelectedText);
         tv.Copy ();
-        tv.Selecting = false;
+        tv.IsSelecting = false;
         tv.CursorPosition = new (2, 4);
         tv.Paste ();
         Application.Refresh ();
@@ -8989,7 +8989,7 @@ Dialogror ";
                       tv.SelectedText
                      );
         tv.Copy ();
-        tv.Selecting = false;
+        tv.IsSelecting = false;
         tv.CursorPosition = new (2, 4);
         tv.Paste ();
         Application.Refresh ();