alex/rust_minifb
1
0
Fork 0
mirror of https://github.com/italicsjenga/rust_minifb.git synced 2024-12-23 19:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Added code for menu destroy

Browse source 
But it doesn't work for some reason
This commit is contained in:
Daniel Collin 2016-05-09 16:41:01 +02:00
parent 462effd03c
commit 06c7c6b05b
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/os/windows/mod.rs
View file

@ -339,6 +339,7 @@ pub struct Window {
#[allow(non_snake_case)] #[allow(non_snake_case)]
extern "system" { extern "system" {
fn TranslateAcceleratorW(hWnd: HWND, accel: *const ACCEL, pmsg: *const MSG) -> INT; fn TranslateAcceleratorW(hWnd: HWND, accel: *const ACCEL, pmsg: *const MSG) -> INT;
fn RemoveMenu(menu: HMENU, pos: UINT, flags: UINT) -> BOOL;
} }
impl Window { impl Window {
@ -886,13 +887,25 @@ impl Window {
user32::DrawMenuBar(window); user32::DrawMenuBar(window);
} }
// TODO: Proper handle // TODO: Proper handle
MenuHandle(0) MenuHandle(menu.menu_handle as u64)
} }
pub fn remove_menu(&mut self, _handle: MenuHandle) { pub fn remove_menu(&mut self, handle: MenuHandle) {
let window = self.window.unwrap();
let main_menu = unsafe { user32::GetMenu(window) };
for i in 0..self.menus.len() {
if self.menus[i].menu_handle == handle.0 as HMENU {
unsafe {
println!("Removed menu at {}", i);
let _t = RemoveMenu(main_menu, i as UINT, 0);
user32::DrawMenuBar(self.window.unwrap());
}
self.menus.swap_remove(i);
return;
}
}
} }
pub fn is_menu_pressed(&mut self) -> Option<usize> { pub fn is_menu_pressed(&mut self) -> Option<usize> {
@ -1075,13 +1088,17 @@ impl Menu {
name name
} }
fn is_key_virtual_range(key: raw::c_int) -> u32 { fn is_key_virtual_range(_key: raw::c_int) -> u32 {
/*
if (key >= 0x30 && key <= 0x30) || if (key >= 0x30 && key <= 0x30) ||
(key >= 0x41 && key <= 0x5a) { (key >= 0x41 && key <= 0x5a) {
1
} else {
0 0
} else {
1
} }
*/
1
} }
fn get_virt_key(menu_item: &MenuItem, key: raw::c_int) -> u32 { fn get_virt_key(menu_item: &MenuItem, key: raw::c_int) -> u32 {