Francesca's macos changes

Also backports rust-windowing@bfbcab3#diff-1d95fe39cdbaa708c975380a16c314cb
felixrabe · Apr 25, 2019 · 6c81f2a · 6c81f2a
1 parent 7c2e130
commit 6c81f2a
Show file tree

Hide file tree

Showing 11 changed files with 1,323 additions and 2,144 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -98,6 +98,8 @@ extern crate objc;
 #[cfg(target_os = "macos")]
 extern crate cocoa;
 #[cfg(target_os = "macos")]
+extern crate dispatch;
+#[cfg(target_os = "macos")]
 extern crate core_foundation;
 #[cfg(target_os = "macos")]
 extern crate core_graphics;

diff --git a/src/platform_impl/linux/x11/util/window_property.rs b/src/platform_impl/linux/x11/util/window_property.rs
@@ -1,5 +1,3 @@
-use std;
-
 use super::*;
 
 pub type Cardinal = c_long;

diff --git a/src/platform_impl/macos/app_state.rs b/src/platform_impl/macos/app_state.rs
@@ -64,7 +64,7 @@ where
 
     fn handle_user_events(&mut self, control_flow: &mut ControlFlow) {
         let mut will_exit = self.will_exit;
-        for event in self.window_target.inner.receiver.try_iter() {
+        for event in self.window_target.p.receiver.try_iter() {
             (self.callback)(
                 Event::UserEvent(event),
                 &self.window_target,