Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 58 deletions

diff --git a/native/src/window/event.rs b/native/src/window/event.rs
deleted file mode 100644
index e2fb5e66..00000000
--- a/native/src/window/event.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use crate::time::Instant;
-
-use std::path::PathBuf;
-
-/// A window-related event.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub enum Event {
-    /// A window was moved.
-    Moved {
-        /// The new logical x location of the window
-        x: i32,
-        /// The new logical y location of the window
-        y: i32,
-    },
-
-    /// A window was resized.
-    Resized {
-        /// The new logical width of the window
-        width: u32,
-        /// The new logical height of the window
-        height: u32,
-    },
-
-    /// A window redraw was requested.
-    ///
-    /// The [`Instant`] contains the current time.
-    RedrawRequested(Instant),
-
-    /// The user has requested for the window to close.
-    ///
-    /// Usually, you will want to terminate the execution whenever this event
-    /// occurs.
-    CloseRequested,
-
-    /// A window was focused.
-    Focused,
-
-    /// A window was unfocused.
-    Unfocused,
-
-    /// A file is being hovered over the window.
-    ///
-    /// When the user hovers multiple files at once, this event will be emitted
-    /// for each file separately.
-    FileHovered(PathBuf),
-
-    /// A file has beend dropped into the window.
-    ///
-    /// When the user drops multiple files at once, this event will be emitted
-    /// for each file separately.
-    FileDropped(PathBuf),
-
-    /// A file was hovered, but has exited the window.
-    ///
-    /// There will be a single `FilesHoveredLeft` event triggered even if
-    /// multiple files were hovered.
-    FilesHoveredLeft,
-}