diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2015-01-13 20:59:48 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2015-01-13 20:59:48 +0100 |
commit | e3943945c75465fa813ea8eb75d56cf55b2c092e (patch) | |
tree | 81526203a89160898dc8ee55472628012f2708b0 /src/win32/monitor.rs | |
parent | 2d4f1c72fbd3c53f7ec9049076f435c95666293e (diff) | |
parent | 5a4fee967a9f2d7d64edad09bf1f19a5c560032e (diff) | |
download | glutin-e3943945c75465fa813ea8eb75d56cf55b2c092e.tar.gz glutin-e3943945c75465fa813ea8eb75d56cf55b2c092e.zip |
Merge pull request #197 from ozkriff/master
x11, android, win: [ui]size -> [ui]32
Diffstat (limited to 'src/win32/monitor.rs')
-rw-r--r-- | src/win32/monitor.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/win32/monitor.rs b/src/win32/monitor.rs index 4bc9cad..2078a52 100644 --- a/src/win32/monitor.rs +++ b/src/win32/monitor.rs @@ -17,10 +17,10 @@ pub struct MonitorID { /// The position of the monitor in pixels on the desktop. /// /// A window that is positionned at these coordinates will overlap the monitor. - position: (uint, uint), + position: (u32, u32), /// The current resolution in pixels on the monitor. - dimensions: (uint, uint), + dimensions: (u32, u32), } /// Win32 implementation of the main `get_available_monitors` function. @@ -32,7 +32,7 @@ pub fn get_available_monitors() -> RingBuf<MonitorID> { // enumerating the devices is done by querying device 0, then device 1, then device 2, etc. // until the query function returns null - for id in iter::count(0u, 1) { + for id in iter::count(0u32, 1) { // getting the DISPLAY_DEVICEW object of the current device let output = { let mut output: winapi::DISPLAY_DEVICEW = unsafe { mem::zeroed() }; @@ -72,9 +72,9 @@ pub fn get_available_monitors() -> RingBuf<MonitorID> { } let point: &winapi::POINTL = mem::transmute(&dev.union1); - let position = (point.x as uint, point.y as uint); + let position = (point.x as u32, point.y as u32); - let dimensions = (dev.dmPelsWidth as uint, dev.dmPelsHeight as uint); + let dimensions = (dev.dmPelsWidth as u32, dev.dmPelsHeight as u32); (position, dimensions) }; @@ -113,7 +113,7 @@ impl MonitorID { } /// See the docs if the crate root file. - pub fn get_dimensions(&self) -> (uint, uint) { + pub fn get_dimensions(&self) -> (u32, u32) { // TODO: retreive the dimensions every time this is called self.dimensions } @@ -127,7 +127,7 @@ impl MonitorID { /// This is a Win32-only function for `MonitorID` that returns the position of the /// monitor on the desktop. /// A window that is positionned at these coordinates will overlap the monitor. - pub fn get_position(&self) -> (uint, uint) { + pub fn get_position(&self) -> (u32, u32) { self.position } } |