auto merge of #4438 : glennw/servo/android-fix-1, r=metajack

...it method to glutin port.

2 files changed, 8 insertions, 1 deletions

diff --git a/cargo-nightly-build b/cargo-nightly-build
index d0f00f0d51e..0211bdc0da7 100644
--- a/cargo-nightly-build
+++ b/cargo-nightly-build
@@ -1 +1 @@
-2014-12-02
+2014-12-18
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index ca604900024..8b9e5f70f68 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -32,6 +32,7 @@ use gleam::gl;
 use glutin;
 use glutin::{ElementState, Event, MouseButton, VirtualKeyCode};
 use NestedEventLoopListener;
+use util::cursor::Cursor;
 
 #[cfg(target_os="linux")]
 use std::ptr;
@@ -223,6 +224,12 @@ impl WindowMethods for Window {
         // TODO(gw)
     }
 
+    fn set_cursor(&self, _: Cursor) {
+        // No-op. We could take over mouse handling ourselves and draw the cursor as an extra
+        // layer with our own custom bitmaps or something, but it doesn't seem worth the
+        // trouble.
+    }
+
     fn prepare_for_composite(&self) -> bool {
         true
     }