Remove api_transition macro (#279)

* Remove api_transition macro * Rename Window2 to Window * Try fix X11 code
rust-windowing · Sep 6, 2017 · 342d5d8 · 342d5d8
1 parent 0ada6c1
commit 342d5d8
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 247 deletions.
diff --git a/src/api_transition.rs b/src/api_transition.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -115,9 +115,6 @@ extern crate wayland_client;
 pub use events::*;
 pub use window::{AvailableMonitorsIter, MonitorId};
 
-#[macro_use]
-mod api_transition;
-
 mod platform;
 mod events;
 mod window;
@@ -144,7 +141,7 @@ pub mod os;
 /// });
 /// ```
 pub struct Window {
-    window: platform::Window2,
+    window: platform::Window,
 }
 
 /// Identifier of a window. Unique for each window.

diff --git a/src/os/unix.rs b/src/os/unix.rs
@@ -7,7 +7,7 @@ use EventsLoop;
 use MonitorId;
 use Window;
 use platform::EventsLoop as LinuxEventsLoop;
-use platform::Window2 as LinuxWindow;
+use platform::Window as LinuxWindow;
 use WindowBuilder;
 use platform::x11::XConnection;
 use platform::x11::ffi::XVisualInfo;

diff --git a/src/platform/android/mod.rs b/src/platform/android/mod.rs
@@ -133,7 +133,7 @@ pub struct WindowId;
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct DeviceId;
 
-pub struct Window2 {
+pub struct Window {
     native_window: *const c_void,
 }
 
@@ -159,10 +159,10 @@ pub struct PlatformSpecificWindowBuilderAttributes;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificHeadlessBuilderAttributes;
 
-impl Window2 {
+impl Window {
     pub fn new(_: &EventsLoop, win_attribs: &WindowAttributes,
                _: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window2, CreationError>
+               -> Result<Window, CreationError>
     {
         // not implemented
         assert!(win_attribs.min_dimensions.is_none());
@@ -175,7 +175,7 @@ impl Window2 {
 
         android_glue::set_multitouch(win_attribs.multitouch);
 
-        Ok(Window2 {
+        Ok(Window {
             native_window: native_window as *const _,
         })
     }
@@ -269,8 +269,8 @@ impl Window2 {
     }
 }
 
-unsafe impl Send for Window2 {}
-unsafe impl Sync for Window2 {}
+unsafe impl Send for Window {}
+unsafe impl Sync for Window {}
 
 // Constant device ID, to be removed when this backend is updated to report real device IDs.
 const DEVICE_ID: ::DeviceId = ::DeviceId(DeviceId);
diff --git a/src/platform/ios/mod.rs b/src/platform/ios/mod.rs
@@ -98,7 +98,7 @@ static mut jmpbuf: [c_int;27] = [0;27];
 #[derive(Clone)]
 pub struct MonitorId;
 
-pub struct Window2 {
+pub struct Window {
     delegate_state: *mut DelegateState
 }
 
@@ -258,11 +258,11 @@ pub struct DeviceId;
 #[derive(Clone, Default)]
 pub struct PlatformSpecificWindowBuilderAttributes;
 
-impl Window2 {
+impl Window {
     pub fn new(ev: &EventsLoop, _: &WindowAttributes, _: &PlatformSpecificWindowBuilderAttributes)
-               -> Result<Window2, CreationError>
+               -> Result<Window, CreationError>
     {
-        Ok(Window2 {
+        Ok(Window {
             delegate_state: ev.delegate_state,
         })
     }