alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings while compiling for win32

Browse source
This commit is contained in:
Tomaka17 2014-10-11 17:58:17 +02:00
parent 8e8549b4ac
commit cb32e64b72
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/win32/init.rs
View file

@ -24,7 +24,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
// initializing variables to be sent to the task // initializing variables to be sent to the task
let title = builder_title.as_slice().utf16_units() let title = builder_title.as_slice().utf16_units()
.collect::<Vec<u16>>().append_one(0); // title to utf16 .chain(Some(0).into_iter()).collect::<Vec<u16>>(); // title to utf16
//let hints = hints.clone(); //let hints = hints.clone();
let (tx, rx) = channel(); let (tx, rx) = channel();
@ -34,8 +34,8 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
TaskBuilder::new().native().spawn(proc() { TaskBuilder::new().native().spawn(proc() {
// registering the window class // registering the window class
let class_name = { let class_name = {
let class_name: Vec<u16> = "Window Class".utf16_units().collect::<Vec<u16>>() let class_name: Vec<u16> = "Window Class".utf16_units().chain(Some(0).into_iter())
.append_one(0); .collect::<Vec<u16>>();
let class = ffi::WNDCLASSEX { let class = ffi::WNDCLASSEX {
cbSize: mem::size_of::<ffi::WNDCLASSEX>() as ffi::UINT, cbSize: mem::size_of::<ffi::WNDCLASSEX>() as ffi::UINT,
@ -333,7 +333,8 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
// loading the opengl32 module // loading the opengl32 module
let gl_library = { let gl_library = {
let name = "opengl32.dll".utf16_units().collect::<Vec<u16>>().append_one(0).as_ptr(); let name = "opengl32.dll".utf16_units().chain(Some(0).into_iter())
.collect::<Vec<u16>>().as_ptr();
let lib = unsafe { ffi::LoadLibraryW(name) }; let lib = unsafe { ffi::LoadLibraryW(name) };
if lib.is_null() { if lib.is_null() {
tx.send(Err(format!("LoadLibrary function failed: {}", tx.send(Err(format!("LoadLibrary function failed: {}",

3
src/win32/mod.rs
View file

@ -85,7 +85,8 @@ impl Window {
pub fn set_title(&self, text: &str) { pub fn set_title(&self, text: &str) {
unsafe { unsafe {
ffi::SetWindowTextW(self.window, ffi::SetWindowTextW(self.window,
text.utf16_units().collect::<Vec<u16>>().append_one(0).as_ptr() as ffi::LPCWSTR); text.utf16_units().chain(Some(0).into_iter())
.collect::<Vec<u16>>().as_ptr() as ffi::LPCWSTR);
} }
} }