leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation warnings

Browse source
This commit is contained in:
Tomaka17 2014-09-23 08:01:18 +02:00
parent 0773427513
commit ea957ce1d7
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/win32/init.rs
View file

@ -87,7 +87,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
screen_settings.dmFields = ffi::DM_BITSPERPEL | ffi::DM_PELSWIDTH | ffi::DM_PELSHEIGHT;
let result = unsafe { ffi::ChangeDisplaySettingsExW(monitor.get_system_name().as_ptr(),
&mut screen_settings, ptr::null(), ffi::CDS_FULLSCREEN, ptr::mut_null()) };
&mut screen_settings, ptr::null(), ffi::CDS_FULLSCREEN, ptr::null_mut()) };
if result != ffi::DISP_CHANGE_SUCCESSFUL {
tx.send(Err(format!("ChangeDisplaySettings failed: {}", result)));
@ -117,7 +117,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
ffi::CW_USEDEFAULT, ffi::CW_USEDEFAULT,
rect.right - rect.left, rect.bottom - rect.top,
ptr::null(), ptr::null(), ffi::GetModuleHandleW(ptr::null()),
ptr::mut_null());
ptr::null_mut());
if handle.is_null() {
use std::os;
@ -240,7 +240,7 @@ pub fn new_window(builder: WindowBuilder) -> Result<Window, String> {
if builder.monitor.is_some() { 0 } else { ffi::CW_USEDEFAULT },
width.unwrap_or(ffi::CW_USEDEFAULT), height.unwrap_or(ffi::CW_USEDEFAULT),
ptr::null(), ptr::null(), ffi::GetModuleHandleW(ptr::null()),
ptr::mut_null());
ptr::null_mut());
if handle.is_null() {
use std::os;

2
src/win32/monitor.rs
View file

@ -95,7 +95,7 @@ pub fn get_primary_monitor() -> MonitorID {
// we simply get all available monitors and return the one with the `PRIMARY_DEVICE` flag
// TODO: it is possible to query the win32 API for the primary monitor, this should be done
// instead
for monitor in get_available_monitors().move_iter() {
for monitor in get_available_monitors().into_iter() {
if (monitor.flags & ffi::DISPLAY_DEVICE_PRIMARY_DEVICE) != 0 {
return monitor
}