alex/baseview
1
0
Fork 0
Code Activity

Fix Windows compilation issue

Browse source
This commit is contained in:
Joakim Frostegård 2022-11-24 00:07:55 +01:00 committed by Robbert van der Helm
parent 10c970a329
commit e35f3080f6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/win/window.rs
View file

@ -26,7 +26,7 @@ use std::rc::Rc;
use raw_window_handle::{ use raw_window_handle::{
HasRawDisplayHandle, HasRawWindowHandle, RawDisplayHandle, RawWindowHandle, Win32WindowHandle, HasRawDisplayHandle, HasRawWindowHandle, RawDisplayHandle, RawWindowHandle, Win32WindowHandle,
Win32WindowHandle, WindowsDisplayHandle, WindowsDisplayHandle,
}; };
const BV_WINDOW_MUST_CLOSE: UINT = WM_USER + 1; const BV_WINDOW_MUST_CLOSE: UINT = WM_USER + 1;
@ -90,9 +90,9 @@ unsafe impl HasRawWindowHandle for WindowHandle {
let mut handle = Win32WindowHandle::empty(); let mut handle = Win32WindowHandle::empty();
handle.hwnd = hwnd as *mut c_void; handle.hwnd = hwnd as *mut c_void;
RawWindowHandle::Windows(handle) RawWindowHandle::Win32(handle)
} else { } else {
RawWindowHandle::Windows(Win32WindowHandle::empty()) RawWindowHandle::Win32(Win32WindowHandle::empty())
} }
} }
} }
@ -539,7 +539,7 @@ impl Window<'_> {
B: Send + 'static, B: Send + 'static,
{ {
let parent = match parent.raw_window_handle() { let parent = match parent.raw_window_handle() {
RawWindowHandle::Windows(h) => h.hwnd as HWND, RawWindowHandle::Win32(h) => h.hwnd as HWND,
h => panic!("unsupported parent handle {:?}", h), h => panic!("unsupported parent handle {:?}", h),
}; };
@ -649,7 +649,7 @@ impl Window<'_> {
let gl_context: Option<GlContext> = options.gl_config.map(|gl_config| { let gl_context: Option<GlContext> = options.gl_config.map(|gl_config| {
let mut handle = Win32WindowHandle::empty(); let mut handle = Win32WindowHandle::empty();
handle.hwnd = hwnd as *mut c_void; handle.hwnd = hwnd as *mut c_void;
let handle = RawWindowHandleWrapper { handle: RawWindowHandle::Windows(handle) }; let handle = RawWindowHandleWrapper { handle: RawWindowHandle::Win32(handle) };
GlContext::create(&handle, gl_config).expect("Could not create OpenGL context") GlContext::create(&handle, gl_config).expect("Could not create OpenGL context")
}); });
@ -763,7 +763,7 @@ unsafe impl HasRawWindowHandle for Window<'_> {
let mut handle = Win32WindowHandle::empty(); let mut handle = Win32WindowHandle::empty();
handle.hwnd = self.state.hwnd as *mut c_void; handle.hwnd = self.state.hwnd as *mut c_void;
RawWindowHandle::Windows(handle) RawWindowHandle::Win32(handle)
} }
} }