aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/android/mod.rs17
-rw-r--r--src/lib.rs2
2 files changed, 7 insertions, 12 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index 3a86779..7279f99 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -212,16 +212,6 @@ impl Window {
}
pub fn poll_events(&self) -> Vec<Event> {
- use std::time::Duration;
- use std::io::timer;
- timer::sleep(Duration::milliseconds(16));
- Vec::new()
- }
-
- pub fn wait_events(&self) -> Vec<Event> {
- use std::time::Duration;
- use std::io::timer;
- timer::sleep(Duration::milliseconds(16));
let mut events = Vec::new();
loop {
match self.event_rx.try_recv() {
@@ -244,6 +234,13 @@ impl Window {
events
}
+ pub fn wait_events(&self) -> Vec<Event> {
+ use std::time::Duration;
+ use std::io::timer;
+ timer::sleep(Duration::milliseconds(16));
+ self.poll_events()
+ }
+
pub fn make_current(&self) {
unsafe {
ffi::egl::MakeCurrent(self.display, self.surface, self.surface, self.context);
diff --git a/src/lib.rs b/src/lib.rs
index a1c0a28..6a736cd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,8 +28,6 @@
//!
//! By default only `window` is enabled.
-#[phase(plugin)] extern crate gl_generator;
-
extern crate gl_common;
extern crate libc;