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

child window created using a winapi::HWND instead of a WindowProxy

Browse source
This commit is contained in:
k-brac 2016-11-29 13:02:42 +01:00
parent 2b25bf1480
commit 3e2154a922
5 changed files with 54 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/platform/windows/init.rs
View file

@ -133,7 +133,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pl_attribs: PlatformS
style | winapi::WS_CLIPSIBLINGS | winapi::WS_CLIPCHILDREN,
x.unwrap_or(winapi::CW_USEDEFAULT), y.unwrap_or(winapi::CW_USEDEFAULT),
width.unwrap_or(winapi::CW_USEDEFAULT), height.unwrap_or(winapi::CW_USEDEFAULT),
pl_attribs.parent.map_or(ptr::null_mut(), |v| v.get_proxy_data().hwnd),
pl_attribs.parent.unwrap_or(ptr::null_mut()),
ptr::null_mut(), kernel32::GetModuleHandleW(ptr::null()),
ptr::null_mut());

8
src/platform/windows/mod.rs
View file

@ -15,12 +15,14 @@ use CursorState;
use WindowAttributes;
use window;
#[derive(Clone, Default)]
pub struct PlatformSpecificWindowBuilderAttributes {
pub parent: Option<window::WindowProxy>,
pub parent: Option<winapi::HWND>,
}
unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
#[derive(Clone, Default)]
pub struct PlatformSpecificHeadlessBuilderAttributes;