diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
index 730c1e895e..f1854cf8fb 100644
--- a/src/Avalonia.Controls/AutoCompleteBox.cs
+++ b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -3,28 +3,24 @@
// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
// All other rights reserved.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Avalonia.Collections;
using Avalonia.Controls.Primitives;
+using Avalonia.Controls.Templates;
using Avalonia.Controls.Utils;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Collections;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
using Avalonia.Threading;
-using Avalonia.Controls.Templates;
using Avalonia.VisualTree;
-using Avalonia.Utilities;
-using System.Globalization;
-using System.Collections.Specialized;
-using System.Reactive.Disposables;
-using System.Threading;
-using System.Threading.Tasks;
namespace Avalonia.Controls
{
@@ -63,7 +59,7 @@ namespace Avalonia.Controls
/// event.
///
/// Stable
- public class PopulatingEventArgs : CancelableEventArgs
+ public class PopulatingEventArgs : CancelEventArgs
{
///
/// Gets the text that is used to determine which items to display in
@@ -1490,7 +1486,7 @@ namespace Avalonia.Controls
///
/// property is changing from false to true.
///
- public event EventHandler DropDownOpening;
+ public event EventHandler DropDownOpening;
///
/// Occurs when the value of the
@@ -1504,7 +1500,7 @@ namespace Avalonia.Controls
///
/// property is changing from true to false.
///
- public event EventHandler DropDownClosing;
+ public event EventHandler DropDownClosing;
///
/// Occurs when the
@@ -1569,9 +1565,9 @@ namespace Avalonia.Controls
/// event.
///
/// A
- ///
+ ///
/// that contains the event data.
- protected virtual void OnDropDownOpening(CancelableEventArgs e)
+ protected virtual void OnDropDownOpening(CancelEventArgs e)
{
DropDownOpening?.Invoke(this, e);
}
@@ -1595,9 +1591,9 @@ namespace Avalonia.Controls
/// event.
///
/// A
- ///
+ ///
/// that contains the event data.
- protected virtual void OnDropDownClosing(CancelableEventArgs e)
+ protected virtual void OnDropDownClosing(CancelEventArgs e)
{
DropDownClosing?.Invoke(this, e);
}
@@ -1633,7 +1629,7 @@ namespace Avalonia.Controls
/// The original value.
private void ClosingDropDown(bool oldValue)
{
- var args = new CancelableEventArgs();
+ var args = new CancelEventArgs();
OnDropDownClosing(args);
if (args.Cancel)
@@ -1656,7 +1652,7 @@ namespace Avalonia.Controls
/// The original value, if needed for a revert.
private void OpeningDropDown(bool oldValue)
{
- var args = new CancelableEventArgs();
+ var args = new CancelEventArgs();
// Opening
OnDropDownOpening(args);
diff --git a/src/Avalonia.Interactivity/CancelableEventArgs.cs b/src/Avalonia.Interactivity/CancelableEventArgs.cs
deleted file mode 100644
index 13ff9239f1..0000000000
--- a/src/Avalonia.Interactivity/CancelableEventArgs.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
-// Licensed under the MIT license. See licence.md file in the project root for full license information.
-
-using System;
-
-namespace Avalonia.Interactivity
-{
- public class CancelableEventArgs : EventArgs
- {
- public bool Cancel { get; set; }
-
- public CancelableEventArgs()
- : base()
- { }
- }
-}