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, 9 insertions, 3 deletions

diff --git a/src/window.rs b/src/window.rs
index c8f5c3ae..e4601575 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,6 +1,12 @@
 //! Configure the window of your application in native platforms.
-pub use iced_native::window::Icon;
-pub use iced_native::window::Position;
-pub use iced_native::window::Settings;
+mod position;
+mod settings;
 
+pub mod icon;
+
+pub use icon::Icon;
+pub use position::Position;
+pub use settings::{PlatformSpecific, Settings};
+
+pub use crate::core::window::*;
 pub use crate::runtime::window::*;