Fixed the glutin event conversion API for compatibility with glutin_gfx example.

Author: mitchmindtree

examples/glutin_gfx.rs

@@ -301,7 +301,7 @@ mod feature {
                 let dpi_factor = dpi_factor as conrod::Scalar;
 
                 // Convert glutin event to conrod event, requires conrod to be built with the `glutin` feature
-                if let Some(event) = conrod::backend::glutin::convert(event.clone(), w, h, dpi_factor) {
+                if let Some(event) = conrod::backend::glutin::convert(event.clone(), &window) {
                     ui.handle_event(event);
                 }
 

examples/glutin_glium.rs

@@ -85,13 +85,14 @@ mod feature {
             // NOTE: This will be removed in a future version of conrod as Render events shouldn't
             // be necessary.
             let window = display.get_window().unwrap();
-            ui.handle_event(conrod::backend::glutin::render_event(&window).unwrap());
+            ui.handle_event(conrod::backend::glutin::render_event(window).unwrap());
 
             // Poll for events.
             for event in display.poll_events() {
 
                 // Use the `glutin` backend feature to convert the glutin event to a conrod one.
-                if let Some(event) = conrod::backend::glutin::convert(event.clone(), &window) {
+                let window = display.get_window().unwrap();
+                if let Some(event) = conrod::backend::glutin::convert(event.clone(), window) {
                     ui.handle_event(event);
                 }
 
@@ -112,7 +113,7 @@ mod feature {
             // `window_resize_callback`. https://github.com/tomaka/winit/pull/88
             if let Some(win_rect) = ui.rect_of(ui.window) {
                 let (win_w, win_h) = (win_rect.w() as u32, win_rect.h() as u32);
-                let (w, h) = window.get_inner_size_points().unwrap();
+                let (w, h) = display.get_window().unwrap().get_inner_size_points().unwrap();
                 if w != win_w || h != win_h {
                     let event: conrod::event::Raw = conrod::event::Input::Resize(w, h).into();
                     ui.handle_event(event);

src/backend/glutin.rs

@@ -10,7 +10,7 @@ use input;
 use std;
 
 /// A function for converting a `glutin::Event` to a `conrod::event::Raw`.
-pub fn convert<W>(e: glutin::Event, window: &W) -> Option<event::Raw>
+pub fn convert<W>(e: glutin::Event, window: W) -> Option<event::Raw>
     where W: std::ops::Deref<Target=glutin::Window>,
 {
 
@@ -102,7 +102,7 @@ pub fn convert<W>(e: glutin::Event, window: &W) -> Option<event::Raw>
 ///
 /// NOTE: This will be removed in a future version of conrod as Render events shouldn't be
 /// necessary.
-pub fn render_event<W>(window: &W) -> Option<event::Raw>
+pub fn render_event<W>(window: W) -> Option<event::Raw>
     where W: std::ops::Deref<Target=glutin::Window>,
 {
     window.get_inner_size_pixels().map(|(win_w, win_h)| {