Adapt to gtk-rs/gir#1530

gtk-rs · Jan 20, 2024 · ac4891d · ac4891d
1 parent 88b9e26
commit ac4891d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 43 deletions.
diff --git a/gdk4/src/toplevel_size.rs b/gdk4/src/toplevel_size.rs
@@ -7,9 +7,11 @@ use glib::translate::*;
 glib::wrapper! {
 
 #[doc(alias = "GdkToplevelSize")]
-    pub struct ToplevelSize(BoxedInline<ffi::GdkToplevelSize>);
+    pub struct ToplevelSize(Boxed<ffi::GdkToplevelSize>);
 
     match fn {
+        copy => |ptr| glib::gobject_ffi::g_boxed_copy(ffi::gdk_toplevel_size_get_type(), ptr as *mut _) as *mut ffi::GdkToplevelSize,
+        free => |ptr| glib::gobject_ffi::g_boxed_free(ffi::gdk_toplevel_size_get_type(), ptr as *mut _),
         type_ => || ffi::gdk_toplevel_size_get_type(),
     }
 
@@ -24,7 +26,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.as_ptr(),
                 bounds_width.as_mut_ptr(),
                 bounds_height.as_mut_ptr(),
             );

diff --git a/gtk4/src/subclass/constraint_target.rs b/gtk4/src/subclass/constraint_target.rs
diff --git a/gtk4/src/subclass/mod.rs b/gtk4/src/subclass/mod.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},

diff --git a/gtk4/src/subclass/native.rs b/gtk4/src/subclass/native.rs
diff --git a/gtk4/src/subclass/root.rs b/gtk4/src/subclass/root.rs