fix: merge conflict resulting in windows lint
This commit is contained in:
1 file changed
+1
-1
@@ -35,7 +35,7 @@ mod desktop_platforms {
|
|||||||
#[allow(unused)]
|
#[allow(unused)]
|
||||||
pub fn init_menu_bar(menu: &Menu, window: &Window) {
|
pub fn init_menu_bar(menu: &Menu, window: &Window) {
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
{
|
unsafe {
|
||||||
use tao::platform::windows::WindowExtWindows;
|
use tao::platform::windows::WindowExtWindows;
|
||||||
menu.init_for_hwnd(window.hwnd());
|
menu.init_for_hwnd(window.hwnd());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user