Revert "Update raw-window-handle to 0.2 (rust-windowing#1191)"

This reverts commit 18a0119.
hecrj · Oct 10, 2019 · edc8280 · edc8280
1 parent 1b82ce2
commit edc8280
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ lazy_static = "1"
 libc = "0.2"
 log = "0.4"
 serde = { version = "1", optional = true, features = ["serde_derive"] }
-raw-window-handle = "0.2"
+raw-window-handle = "0.1"
 
 [dev-dependencies]
 image = "0.21"

diff --git a/src/platform_impl/android/mod.rs b/src/platform_impl/android/mod.rs
@@ -19,7 +19,6 @@ use crate::{
     CreationError, CursorIcon, Event, LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize,
     WindowAttributes, WindowEvent, WindowId as RootWindowId,
 };
-use raw_window_handle::{android::AndroidHandle, RawWindowHandle};
 use CreationError::OsError;
 
 pub type OsError = std::io::Error;
@@ -422,15 +421,6 @@ impl Window {
     pub fn id(&self) -> WindowId {
         WindowId
     }
-
-    #[inline]
-    pub fn raw_window_handle(&self) -> RawWindowHandle {
-        let handle = AndroidHandle {
-            a_native_window: self.native_window,
-            ..WindowsHandle::empty()
-        };
-        RawWindowHandle::Android(handle)
-    }
 }
 
 unsafe impl Send for Window {}

diff --git a/src/platform_impl/linux/mod.rs b/src/platform_impl/linux/mod.rs
@@ -461,7 +461,7 @@ impl Window {
 
     pub fn raw_window_handle(&self) -> RawWindowHandle {
         match self {
-            &Window::X(ref window) => RawWindowHandle::Xlib(window.raw_window_handle()),
+            &Window::X(ref window) => RawWindowHandle::X11(window.raw_window_handle()),
             &Window::Wayland(ref window) => RawWindowHandle::Wayland(window.raw_window_handle()),
         }
     }

diff --git a/src/platform_impl/linux/x11/window.rs b/src/platform_impl/linux/x11/window.rs
@@ -1,4 +1,4 @@
-use raw_window_handle::unix::XlibHandle;
+use raw_window_handle::unix::X11Handle;
 use std::{
     cmp,
     collections::HashSet,
@@ -1296,11 +1296,11 @@ impl UnownedWindow {
     }
 
     #[inline]
-    pub fn raw_window_handle(&self) -> XlibHandle {
-        XlibHandle {
+    pub fn raw_window_handle(&self) -> X11Handle {
+        X11Handle {
             window: self.xwindow,
             display: self.xconn.display as _,
-            ..XlibHandle::empty()
+            ..X11Handle::empty()
         }
     }
 }