Merge pull request #630 from tomaka/fix-examples

Fix the examples

examples/cursor.rs

@@ -11,12 +11,7 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
+fn main() {    
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
-fn main() {
-    
     let window = glutin::WindowBuilder::new().build().unwrap();
     window.set_title("A fantastic window!");   
     unsafe { window.make_current() };

examples/fullscreen.rs

@@ -11,10 +11,6 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
 fn main() {
     // enumerating monitors
     let monitor = {

examples/grabbing.rs

@@ -11,10 +11,6 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
 fn main() {
     let window = glutin::WindowBuilder::new().build().unwrap();
     window.set_title("glutin - Cursor grabbing test");

examples/multiwindow.rs

@@ -11,10 +11,6 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
 fn main() {
     let window1 = glutin::WindowBuilder::new().build().unwrap();
     let window2 = glutin::WindowBuilder::new().build().unwrap();
@@ -37,7 +33,6 @@ fn main() {
     let _ = t3.join();
 }
 
-#[cfg(feature = "window")]
 fn run(window: glutin::Window, color: (f32, f32, f32, f32)) {
     let _ = unsafe { window.make_current() };
 

examples/support/mod.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "window")]
-
 use std::ffi::CStr;
 use std::mem;
 use std::ptr;

examples/transparent.rs

@@ -9,15 +9,10 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
 fn resize_callback(width: u32, height: u32) {
     println!("Window resized to {}x{}", width, height);
 }
 
-#[cfg(feature = "window")]
 fn main() {
     let mut window = glutin::WindowBuilder::new().with_decorations(false)
                                                  .with_transparency(true)

examples/window.rs

@@ -9,15 +9,10 @@ mod support;
 #[cfg(target_os = "android")]
 android_start!(main);
 
-#[cfg(not(feature = "window"))]
-fn main() { println!("This example requires glutin to be compiled with the `window` feature"); }
-
-#[cfg(feature = "window")]
 fn resize_callback(width: u32, height: u32) {
     println!("Window resized to {}x{}", width, height);
 }
 
-#[cfg(feature = "window")]
 fn main() {
     let mut window = glutin::WindowBuilder::new().build().unwrap();
     window.set_title("A fantastic window!");