Merge pull request #8 from tomaka/breaking-api-changes

Add WindowBuilder and iterators for events

2 files changed, 8 insertions, 9 deletions

diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs
index b6141a0..80e6089 100644
--- a/examples/fullscreen.rs
+++ b/examples/fullscreen.rs
@@ -5,8 +5,6 @@ extern crate gl;
 use std::io::stdio::stdin;
 
 fn main() {
-    use std::default::Default;
-
     // enumerating monitors
     let monitor = {
         for (num, monitor) in init::get_available_monitors().enumerate() {
@@ -23,8 +21,11 @@ fn main() {
         monitor
     };
 
-    let window = init::Window::new(None, "Hello world!", &Default::default(),
-        Some(monitor)).unwrap();
+    let window = init::WindowBuilder::new()
+        .with_title("Hello world!".to_string())
+        .with_monitor(monitor)
+        .build()
+        .unwrap();
 
     unsafe { window.make_current() };
 
@@ -40,7 +41,7 @@ fn main() {
     gl::ClearColor(0.0, 1.0, 0.0, 1.0);
 
     while !window.is_closed() {
-        println!("{}", window.wait_events());
+        println!("{}", window.wait_events().collect::<Vec<init::Event>>());
 
         gl::Clear(gl::COLOR_BUFFER_BIT);
 
diff --git a/examples/window.rs b/examples/window.rs
index daa856b..c366ee0 100644
--- a/examples/window.rs
+++ b/examples/window.rs
@@ -3,9 +3,7 @@ extern crate libc;
 extern crate gl;
 
 fn main() {
-    use std::default::Default;
-
-    let window = init::Window::new(None, "Hello world!", &Default::default(), None).unwrap();
+    let window = init::Window::new().unwrap();
 
     unsafe { window.make_current() };
 
@@ -21,7 +19,7 @@ fn main() {
     gl::ClearColor(0.0, 1.0, 0.0, 1.0);
 
     while !window.is_closed() {
-        println!("{}", window.wait_events());
+        println!("{}", window.wait_events().collect::<Vec<init::Event>>());
 
         gl::Clear(gl::COLOR_BUFFER_BIT);