gdk4-win32: Fix isize / *mut c_void mismatches

gtk-rs · Aug 27, 2024 · 276c2c0 · 276c2c0
1 parent fd28460
commit 276c2c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/gdk4-win32/src/win32_hcursor.rs b/gdk4-win32/src/win32_hcursor.rs
@@ -1,6 +1,6 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
-use std::ptr::NonNull;
+use std::{ffi::c_void, ptr::NonNull};
 
 use glib::{translate::*, types::Pointee};
 
@@ -17,14 +17,14 @@ impl Win32HCursor {
         unsafe {
             from_glib_full(ffi::gdk_win32_hcursor_new(
                 display.as_ref().to_glib_none().0,
-                handle.0,
+                handle.0 as isize,
                 destroyable.into_glib(),
             ))
         }
     }
 
     pub fn handle(&self) -> HCURSOR {
         let ptr: NonNull<Pointee> = ObjectExt::property(self, "handle");
-        HCURSOR(ptr.as_ptr() as _)
+        HCURSOR(ptr.as_ptr() as *mut c_void)
     }
 }
diff --git a/gdk4-win32/src/win32_surface.rs b/gdk4-win32/src/win32_surface.rs
@@ -1,5 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+use std::ffi::c_void;
+
 use glib::translate::*;
 
 use crate::{ffi, prelude::*, Win32Surface, HWND};
@@ -14,22 +16,25 @@ impl Win32Surface {
         unsafe {
             from_glib_none(ffi::gdk_win32_surface_lookup_for_display(
                 display.as_ref().to_glib_none().0,
-                anid.0,
+                anid.0 as isize,
             ))
         }
     }
 
     #[doc(alias = "gdk_win32_surface_get_handle")]
     #[doc(alias = "get_handle")]
     pub fn handle(&self) -> HWND {
-        HWND(unsafe { ffi::gdk_win32_surface_get_handle(self.to_glib_none().0) })
+        HWND(unsafe { ffi::gdk_win32_surface_get_handle(self.to_glib_none().0) } as *mut c_void)
     }
 
     #[cfg_attr(feature = "v4_8", deprecated = "Since 4.8")]
     #[doc(alias = "gdk_win32_surface_get_impl_hwnd")]
     #[doc(alias = "get_impl_hwnd")]
     pub fn impl_hwnd(surface: &impl IsA<gdk::Surface>) -> HWND {
         assert_initialized_main_thread!();
-        HWND(unsafe { ffi::gdk_win32_surface_get_impl_hwnd(surface.as_ref().to_glib_none().0) })
+        HWND(
+            unsafe { ffi::gdk_win32_surface_get_impl_hwnd(surface.as_ref().to_glib_none().0) }
+                as *mut c_void,
+        )
     }
 }