aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Cargo.toml14
-rw-r--r--examples/cursor.rs4
-rw-r--r--src/api/cocoa/mod.rs4
3 files changed, 11 insertions, 11 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 5cccfe1..5ee7201 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,23 +27,23 @@ clock_ticks = "0.1.0"
version = "0.1"
[target.i386-apple-ios.dependencies]
-objc = "0.1"
+objc = ">=0.1.0, <=0.1.7"
[target.x86_64-apple-ios.dependencies]
-objc = "0.1"
+objc = ">=0.1.0, <=0.1.7"
[target.aarch64-apple-ios.dependencies]
-objc = "0.1"
+objc = ">=0.1.0, <=0.1.7"
[target.armv7s-apple-ios.dependencies]
-objc = "0.1"
+objc = ">=0.1.0, <=0.1.7"
[target.armv7-apple-ios.dependencies]
-objc = "0.1"
+objc = ">=0.1.0, <=0.1.7"
[target.x86_64-apple-darwin.dependencies]
-objc = "0.1"
-cgl = "0"
+objc = ">=0.1.0, <=0.1.7"
+cgl = "0.1"
cocoa = "0.1.4"
core-foundation = "0"
core-graphics = "0"
diff --git a/examples/cursor.rs b/examples/cursor.rs
index cbe6978..167c5cb 100644
--- a/examples/cursor.rs
+++ b/examples/cursor.rs
@@ -14,7 +14,7 @@ android_start!(main);
fn main() {
let window = glutin::WindowBuilder::new().build().unwrap();
window.set_title("A fantastic window!");
- unsafe { window.make_current() };
+ unsafe { window.make_current().unwrap() };
let context = support::load(&window);
let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::NoneCursor, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize];
@@ -36,6 +36,6 @@ fn main() {
}
context.draw_frame((0.0, 1.0, 0.0, 1.0));
- window.swap_buffers();
+ window.swap_buffers().unwrap();
}
}
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index 2b4b5e5..c6d53d4 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -310,7 +310,7 @@ impl Window {
let obj = context.CGLContextObj();
let mut opacity = 0;
- CGLSetParameter(obj, kCGLCPSurfaceOpacity, &mut opacity);
+ CGLSetParameter(obj as *mut _, kCGLCPSurfaceOpacity, &mut opacity);
}
app.activateIgnoringOtherApps_(YES);
@@ -558,7 +558,7 @@ impl Window {
let value = if opengl.vsync { 1 } else { 0 };
cxt.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval);
- CGLEnable(cxt.CGLContextObj(), kCGLCECrashOnRemovedFunctions);
+ CGLEnable(cxt.CGLContextObj() as *mut _, kCGLCECrashOnRemovedFunctions);
Ok((cxt, pf))
} else {