Unix fix attempt

rust-windowing · Jan 28, 2017 · 7d15ddf · 7d15ddf
1 parent 148f507
commit 7d15ddf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/api_transition.rs b/src/api_transition.rs
@@ -55,7 +55,7 @@ macro_rules! gen_api_transition {
         }
 
         pub struct Window2 {
-            window: ::std::sync::Arc<Window>,
+            pub window: ::std::sync::Arc<Window>,
             events_loop: ::std::sync::Weak<EventsLoop>,
         }
 

diff --git a/src/os/unix.rs b/src/os/unix.rs
@@ -86,36 +86,36 @@ pub trait WindowExt {
 impl WindowExt for Window {
     #[inline]
     fn get_xlib_window(&self) -> Option<*mut libc::c_void> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
             _ => None
         }
     }
 
     #[inline]
     fn get_xlib_display(&self) -> Option<*mut libc::c_void> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
             _ => None
         }
     }
 
     fn get_xlib_screen_id(&self) -> Option<*mut libc::c_void> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
             _ => None
         }
     }
 
     fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
             _ => None
         }
     }
 
     fn get_xcb_connection(&self) -> Option<*mut libc::c_void> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
             _ => None
         }
@@ -136,15 +136,15 @@ impl WindowExt for Window {
 
     #[inline]
     fn get_wayland_client_surface(&self) -> Option<&WlSurface> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::Wayland(ref w) => Some(w.get_surface()),
             _ => None
         }
     }
 
     #[inline]
     fn get_wayland_client_display(&self) -> Option<&WlDisplay> {
-        match self.window {
+        match self.window.window {
             LinuxWindow::Wayland(ref w) => Some(w.get_display()),
             _ => None
         }