From b2cf70b342e7f9797d158243f6803f4e68d057ed Mon Sep 17 00:00:00 2001 From: Osspial Date: Sat, 7 May 2016 21:05:45 -0400 Subject: [PATCH] Fixed some warnings when building on Windows --- src/api/win32/callback.rs | 7 +++++-- src/lib.rs | 4 ---- src/platform/windows/mod.rs | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/api/win32/callback.rs b/src/api/win32/callback.rs index fc531ae7..e2b74121 100644 --- a/src/api/win32/callback.rs +++ b/src/api/win32/callback.rs @@ -6,7 +6,6 @@ use std::sync::{Arc, Mutex}; use std::ffi::OsString; use std::os::windows::ffi::OsStringExt; -use WindowAttributes; use CursorState; use Event; use super::event; @@ -28,6 +27,10 @@ pub struct ThreadLocalData { pub mouse_in_window: bool } +/// Equivalent to the windows api [MINMAXINFO](https://msdn.microsoft.com/en-us/library/windows/desktop/ms632605%28v=vs.85%29.aspx) +/// struct. Used because winapi-rs doesn't have this declared. +#[repr(C)] +#[allow(dead_code)] struct MinMaxInfo { reserved: winapi::POINT, // Do not use/change max_size: winapi::POINT, @@ -342,7 +345,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT, }, winapi::WM_GETMINMAXINFO => { - let mut mmi = lparam as *mut MinMaxInfo; + let mmi = lparam as *mut MinMaxInfo; //(*mmi).max_position = winapi::POINT { x: -8, y: -8 }; // The upper left corner of the window if it were maximized on the primary monitor. //(*mmi).max_size = winapi::POINT { x: .., y: .. }; // The dimensions of the primary monitor. diff --git a/src/lib.rs b/src/lib.rs index e92dc031..dea319cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -65,10 +65,6 @@ pub use window::{WindowBuilder, WindowProxy, PollEventsIterator, WaitEventsItera pub use window::{AvailableMonitorsIter, MonitorId, get_available_monitors, get_primary_monitor}; pub use native_monitor::NativeMonitorId; -use std::io; -#[cfg(not(target_os = "macos"))] -use std::cmp::Ordering; - mod api; mod platform; mod events; diff --git a/src/platform/windows/mod.rs b/src/platform/windows/mod.rs index 413a12f2..249ee157 100644 --- a/src/platform/windows/mod.rs +++ b/src/platform/windows/mod.rs @@ -7,9 +7,7 @@ pub use api::win32::{WindowProxy, PollEventsIterator, WaitEventsIterator}; use CreationError; use WindowAttributes; -use std::ffi::CString; use std::ops::{Deref, DerefMut}; -use kernel32; #[derive(Default)] pub struct PlatformSpecificWindowBuilderAttributes;