Merge pull request #204 from tomaka/fix-osx-attempt

More OS/X fixes
This commit is contained in:
tomaka 2015-01-15 21:01:21 +01:00
commit 2cabfdd373

View file

@ -51,7 +51,7 @@ struct DelegateState<'a> {
is_closed: bool, is_closed: bool,
context: id, context: id,
view: id, view: id,
handler: Option<fn(usize, usize)>, handler: Option<fn(u32, u32)>,
} }
pub struct Window { pub struct Window {
@ -59,7 +59,7 @@ pub struct Window {
window: id, window: id,
context: id, context: id,
delegate: id, delegate: id,
resize: Option<fn(usize, usize)>, resize: Option<fn(u32, u32)>,
is_closed: Cell<bool>, is_closed: Cell<bool>,
} }
@ -128,7 +128,7 @@ extern fn window_did_resize(this: id, _: id) -> id {
match state.handler { match state.handler {
Some(handler) => { Some(handler) => {
let rect = NSView::frame(state.view); let rect = NSView::frame(state.view);
(handler)(rect.size.width as usize, rect.size.height as usize); (handler)(rect.size.width as u32, rect.size.height as u32);
} }
None => {} None => {}
} }
@ -488,7 +488,7 @@ impl Window {
::Api::OpenGl ::Api::OpenGl
} }
pub fn set_window_resize_callback(&mut self, callback: Option<fn(usize, usize)>) { pub fn set_window_resize_callback(&mut self, callback: Option<fn(u32, u32)>) {
self.resize = callback; self.resize = callback;
} }