Skip to content

Commit 6c81f2a

Browse files
goddessfreyaOsspial
goddessfreya
authored and
Osspial
committed
Francesca's macos changes
Also backports rust-windowing@bfbcab3#diff-1d95fe39cdbaa708c975380a16c314cb
1 parent 7c2e130 commit 6c81f2a

11 files changed

Lines changed: 1323 additions & 2144 deletions

File tree

‎src/lib.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ extern crate objc;
9898
#[cfg(target_os = "macos")]
9999
extern crate cocoa;
100100
#[cfg(target_os = "macos")]
101+
extern crate dispatch;
102+
#[cfg(target_os = "macos")]
101103
extern crate core_foundation;
102104
#[cfg(target_os = "macos")]
103105
extern crate core_graphics;

‎src/platform_impl/linux/x11/util/window_property.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std;
2-
31
use super::*;
42

53
pub type Cardinal = c_long;

‎src/platform_impl/macos/app_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ where
6464

6565
fn handle_user_events(&mut self, control_flow: &mut ControlFlow) {
6666
let mut will_exit = self.will_exit;
67-
for event in self.window_target.inner.receiver.try_iter() {
67+
for event in self.window_target.p.receiver.try_iter() {
6868
(self.callback)(
6969
Event::UserEvent(event),
7070
&self.window_target,

0 commit comments

Comments
 (0)