Adapt to gtk-rs/gir#1530

Author: bilelmoussaoui

gdk4/src/toplevel_size.rs

@@ -4,15 +4,16 @@ use std::fmt;
 
 use glib::translate::*;
 
-glib::wrapper! {
+use std::ptr::NonNull;
 
+#[repr(transparent)]
 #[doc(alias = "GdkToplevelSize")]
-    pub struct ToplevelSize(BoxedInline<ffi::GdkToplevelSize>);
+pub struct ToplevelSize(NonNull<ffi::GdkToplevelSize>);
 
-    match fn {
-        type_ => || ffi::gdk_toplevel_size_get_type(),
+impl glib::StaticType for ToplevelSize {
+    fn static_type() -> glib::Type {
+        unsafe { from_glib(ffi::gdk_toplevel_size_get_type()) }
     }
-
 }
 
 impl ToplevelSize {
@@ -24,7 +25,7 @@ impl ToplevelSize {
             let mut bounds_height = std::mem::MaybeUninit::uninit();
 
             ffi::gdk_toplevel_size_get_bounds(
-                self.to_glib_none().0 as *mut _,
+                self.0.as_ptr(),
                 bounds_width.as_mut_ptr(),
                 bounds_height.as_mut_ptr(),
             );
@@ -35,27 +36,21 @@ impl ToplevelSize {
     #[doc(alias = "gdk_toplevel_size_set_min_size")]
     pub fn set_min_size(&mut self, min_width: i32, min_height: i32) {
         unsafe {
-            ffi::gdk_toplevel_size_set_min_size(self.to_glib_none_mut().0, min_width, min_height);
+            ffi::gdk_toplevel_size_set_min_size(self.0.as_mut(), min_width, min_height);
         }
     }
 
     #[doc(alias = "gdk_toplevel_size_set_shadow_width")]
     pub fn set_shadow_width(&mut self, left: i32, right: i32, top: i32, bottom: i32) {
         unsafe {
-            ffi::gdk_toplevel_size_set_shadow_width(
-                self.to_glib_none_mut().0,
-                left,
-                right,
-                top,
-                bottom,
-            );
+            ffi::gdk_toplevel_size_set_shadow_width(self.0.as_mut(), left, right, top, bottom);
         }
     }
 
     #[doc(alias = "gdk_toplevel_size_set_size")]
     pub fn set_size(&mut self, width: i32, height: i32) {
         unsafe {
-            ffi::gdk_toplevel_size_set_size(self.to_glib_none_mut().0, width, height);
+            ffi::gdk_toplevel_size_set_size(self.0.as_mut(), width, height);
         }
     }
 }

gtk4/src/subclass/constraint_target.rs

@@ -37,7 +37,6 @@ pub mod cell_renderer_text;
 pub mod check_button;
 pub mod color_chooser;
 pub mod combo_box;
-pub mod constraint_target;
 pub mod dialog;
 pub mod drawing_area;
 pub mod editable;
@@ -56,15 +55,13 @@ pub mod layout_manager;
 pub mod list_box_row;
 pub mod media_file;
 pub mod media_stream;
-pub mod native;
 pub mod native_dialog;
 pub mod orientable;
 pub mod popover;
 pub mod print_operation;
 pub mod print_operation_preview;
 pub mod range;
 pub mod recent_manager;
-pub mod root;
 pub mod scale;
 pub mod scale_button;
 pub mod scrollable;
@@ -126,7 +123,6 @@ pub mod prelude {
         check_button::{CheckButtonImpl, CheckButtonImplExt},
         color_chooser::{ColorChooserImpl, ColorChooserImplExt},
         combo_box::{ComboBoxImpl, ComboBoxImplExt},
-        constraint_target::ConstraintTargetImpl,
         dialog::{DialogImpl, DialogImplExt},
         drawing_area::{DrawingAreaImpl, DrawingAreaImplExt},
         editable::{EditableImpl, EditableImplExt},
@@ -145,15 +141,13 @@ pub mod prelude {
         list_box_row::{ListBoxRowImpl, ListBoxRowImplExt},
         media_file::{MediaFileImpl, MediaFileImplExt},
         media_stream::{MediaStreamImpl, MediaStreamImplExt},
-        native::NativeImpl,
         native_dialog::{NativeDialogImpl, NativeDialogImplExt},
         orientable::OrientableImpl,
         popover::{PopoverImpl, PopoverImplExt},
         print_operation::{PrintOperationImpl, PrintOperationImplExt},
         print_operation_preview::PrintOperationPreviewImpl,
         range::{RangeImpl, RangeImplExt},
         recent_manager::{RecentManagerImpl, RecentManagerImplExt},
-        root::RootImpl,
         scale::{ScaleImpl, ScaleImplExt},
         scale_button::{ScaleButtonImpl, ScaleButtonImplExt},
         scrollable::{ScrollableImpl, ScrollableImplExt},