hpopupmenu()

tauri-apps · Aug 15, 2024 · 4d3902e · 4d3902e
1 parent a465da4
commit 4d3902e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/items/submenu.rs b/src/items/submenu.rs
@@ -212,7 +212,7 @@ impl Submenu {
 
 impl ContextMenu for Submenu {
     #[cfg(target_os = "windows")]
-    fn hpopupmenu(&self) -> windows_sys::Win32::UI::WindowsAndMessaging::HMENU {
+    fn hpopupmenu(&self) -> isize {
         self.inner.borrow().hpopupmenu()
     }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -304,7 +304,7 @@ pub trait ContextMenu {
     ///
     /// [`HMENU`]: windows_sys::Win32::UI::WindowsAndMessaging::HMENU
     #[cfg(target_os = "windows")]
-    fn hpopupmenu(&self) -> windows_sys::Win32::UI::WindowsAndMessaging::HMENU;
+    fn hpopupmenu(&self) -> isize;
 
     /// Shows this menu as a context menu inside a win32 window.
     ///

diff --git a/src/menu.rs b/src/menu.rs
@@ -336,7 +336,7 @@ impl Menu {
 
 impl ContextMenu for Menu {
     #[cfg(target_os = "windows")]
-    fn hpopupmenu(&self) -> windows_sys::Win32::UI::WindowsAndMessaging::HMENU {
+    fn hpopupmenu(&self) -> isize {
         self.inner.borrow().hpopupmenu()
     }
 

diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs
@@ -321,8 +321,8 @@ impl Menu {
         self.haccel_store.borrow().0 as _
     }
 
-    pub fn hpopupmenu(&self) -> HMENU {
-        self.hpopupmenu
+    pub fn hpopupmenu(&self) -> isize {
+        self.hpopupmenu as _
     }
 
     pub fn init_for_hwnd_with_theme(&mut self, hwnd: isize, theme: MenuTheme) -> crate::Result<()> {
@@ -782,8 +782,8 @@ impl MenuChild {
 
 /// Submenu methods
 impl MenuChild {
-    pub fn hpopupmenu(&self) -> HMENU {
-        self.hpopupmenu
+    pub fn hpopupmenu(&self) -> isize {
+        self.hpopupmenu as _
     }
 
     pub fn add_menu_item(&mut self, item: &dyn IsMenuItem, op: AddOp) -> crate::Result<()> {