From 9e057951a65f160f0def46317f269588ebecdbe6 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Fri, 21 Jun 2024 23:54:02 +0200 Subject: [PATCH] Regen bindings --- Cargo.lock | 39 ++++++++++++++++-------- gdk4-wayland/src/auto/versions.txt | 4 +-- gdk4-wayland/sys/Cargo.toml | 2 +- gdk4-wayland/sys/versions.txt | 4 +-- gdk4-win32/src/auto/versions.txt | 4 +-- gdk4-win32/sys/Cargo.toml | 2 +- gdk4-win32/sys/versions.txt | 4 +-- gdk4-x11/src/auto/versions.txt | 4 +-- gdk4-x11/sys/Cargo.toml | 2 +- gdk4-x11/sys/versions.txt | 4 +-- gdk4/Gir.toml | 4 +-- gdk4/src/auto/versions.txt | 4 +-- gdk4/sys/Cargo.toml | 2 +- gdk4/sys/src/lib.rs | 8 ++--- gdk4/sys/versions.txt | 4 +-- gir | 2 +- gir-files | 2 +- gsk4/src/auto/gl_renderer.rs | 4 --- gsk4/src/auto/mod.rs | 4 +++ gsk4/src/auto/versions.txt | 4 +-- gsk4/sys/Cargo.toml | 2 +- gsk4/sys/src/lib.rs | 2 ++ gsk4/sys/versions.txt | 4 +-- gtk4/Gir.toml | 3 ++ gtk4/src/auto/drag_icon.rs | 17 ++++++----- gtk4/src/auto/font_dialog_button.rs | 40 ++++++++++++++++++++++++ gtk4/src/auto/graphics_offload.rs | 4 +++ gtk4/src/auto/image.rs | 1 - gtk4/src/auto/list_box.rs | 20 ++++++------ gtk4/src/auto/map_list_model.rs | 1 - gtk4/src/auto/notebook.rs | 47 ++++++++++++++++------------- gtk4/src/auto/versions.txt | 4 +-- gtk4/src/auto/widget.rs | 3 +- gtk4/src/auto/window.rs | 3 ++ gtk4/sys/Cargo.toml | 2 +- gtk4/sys/src/lib.rs | 2 +- gtk4/sys/versions.txt | 4 +-- 37 files changed, 169 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 330eec3d3061..2d778e8bc9ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,7 +144,7 @@ source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#dc97710becdf43 dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -409,7 +409,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -440,7 +440,7 @@ dependencies = [ "pango-sys", "pkg-config", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -466,7 +466,7 @@ dependencies = [ "glib-sys", "libc", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -492,7 +492,7 @@ dependencies = [ "glib-sys", "libc", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -518,7 +518,7 @@ dependencies = [ "glib-sys", "libc", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -574,7 +574,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.2.2", "windows-sys 0.52.0", ] @@ -654,7 +654,7 @@ version = "0.20.0" source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#dc97710becdf432e5a97e0b7c22d4d1daa8cfec6" dependencies = [ "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -697,7 +697,7 @@ source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=master#dc97710becdf43 dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -718,7 +718,7 @@ dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -747,7 +747,7 @@ dependencies = [ "libc", "pango-sys", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -820,7 +820,7 @@ dependencies = [ "libc", "pango-sys", "shell-words", - "system-deps", + "system-deps 7.0.1", "tempfile", ] @@ -1200,7 +1200,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -1673,6 +1673,19 @@ dependencies = [ "version-compare", ] +[[package]] +name = "system-deps" +version = "7.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + [[package]] name = "takeable-option" version = "0.5.0" diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-wayland/src/auto/versions.txt +++ b/gdk4-wayland/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4-wayland/sys/Cargo.toml b/gdk4-wayland/sys/Cargo.toml index 5a5f083d73fe..d1a9683e3c43 100644 --- a/gdk4-wayland/sys/Cargo.toml +++ b/gdk4-wayland/sys/Cargo.toml @@ -66,7 +66,7 @@ libc = "0.2" workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" [dev-dependencies] shell-words = "1.0.0" diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-wayland/sys/versions.txt +++ b/gdk4-wayland/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-win32/src/auto/versions.txt +++ b/gdk4-win32/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4-win32/sys/Cargo.toml b/gdk4-win32/sys/Cargo.toml index 73d85b6ebb3c..801ffe2aa99f 100644 --- a/gdk4-win32/sys/Cargo.toml +++ b/gdk4-win32/sys/Cargo.toml @@ -61,7 +61,7 @@ workspace = true workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" [dev-dependencies] shell-words = "1.0.0" diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-win32/sys/versions.txt +++ b/gdk4-win32/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-x11/src/auto/versions.txt +++ b/gdk4-x11/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4-x11/sys/Cargo.toml b/gdk4-x11/sys/Cargo.toml index 4ffe38d51741..073cde7520be 100644 --- a/gdk4-x11/sys/Cargo.toml +++ b/gdk4-x11/sys/Cargo.toml @@ -65,7 +65,7 @@ workspace = true workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" [dev-dependencies] shell-words = "1.0.0" diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4-x11/sys/versions.txt +++ b/gdk4-x11/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4/Gir.toml b/gdk4/Gir.toml index bcd0f7996fbd..8e67a60cadb7 100644 --- a/gdk4/Gir.toml +++ b/gdk4/Gir.toml @@ -485,7 +485,7 @@ status = "generate" version = "4.8" [[object.member]] name = "event_last" - alias = true # not useful + ignore = true # not useful [[object]] name = "Gdk.FileList" @@ -556,7 +556,7 @@ status = "generate" version = "4.6" [[object.member]] name = "n_formats" - alias = true # not useful + ignore = true # not useful [[object]] name = "Gdk.MemoryTexture" diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4/src/auto/versions.txt +++ b/gdk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml index 6cb68fc99e24..defa4b499674 100644 --- a/gdk4/sys/Cargo.toml +++ b/gdk4/sys/Cargo.toml @@ -97,7 +97,7 @@ workspace = true workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" pkg-config = "0.3.30" [dev-dependencies] diff --git a/gdk4/sys/src/lib.rs b/gdk4/sys/src/lib.rs index cf29f5be0973..4ec051919ff4 100644 --- a/gdk4/sys/src/lib.rs +++ b/gdk4/sys/src/lib.rs @@ -3995,6 +3995,9 @@ extern "C" { //========================================================================= #[cfg(feature = "v4_12")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))] + pub fn gdk_drag_surface_size_get_type() -> GType; + #[cfg(feature = "v4_12")] + #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))] pub fn gdk_drag_surface_size_set_size( size: *mut GdkDragSurfaceSize, width: c_int, @@ -4206,6 +4209,7 @@ extern "C" { //========================================================================= // GdkToplevelSize //========================================================================= + pub fn gdk_toplevel_size_get_type() -> GType; pub fn gdk_toplevel_size_get_bounds( size: *mut GdkToplevelSize, bounds_width: *mut c_int, @@ -5525,9 +5529,6 @@ extern "C" { result: *mut gio::GAsyncResult, error: *mut *mut glib::GError, ) -> gboolean; - #[cfg(feature = "v4_12")] - #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))] - pub fn gdk_drag_surface_size_get_type() -> GType; pub fn gdk_events_get_angle( event1: *mut GdkEvent, event2: *mut GdkEvent, @@ -5576,7 +5577,6 @@ extern "C" { ) -> *mut gdk_pixbuf::GdkPixbuf; pub fn gdk_pixbuf_get_from_texture(texture: *mut GdkTexture) -> *mut gdk_pixbuf::GdkPixbuf; pub fn gdk_set_allowed_backends(backends: *const c_char); - pub fn gdk_toplevel_size_get_type() -> GType; pub fn gdk_unicode_to_keyval(wc: u32) -> c_uint; } diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gdk4/sys/versions.txt +++ b/gdk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gir b/gir index d26d8f60b97d..cbffeb655c48 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit d26d8f60b97d1ceb444d7a7fbf716df659ad1e8e +Subproject commit cbffeb655c4817664d3f8ef5d1cc5dc69c0eed80 diff --git a/gir-files b/gir-files index 74aa91d9063d..85cf3aab5665 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 74aa91d9063df2708b804ef77c5e035b10d8fbc7 +Subproject commit 85cf3aab56652fa6744083a6c4e2cca8cb73507e diff --git a/gsk4/src/auto/gl_renderer.rs b/gsk4/src/auto/gl_renderer.rs index 6a3cd413ca2e..42bbe75bfb39 100644 --- a/gsk4/src/auto/gl_renderer.rs +++ b/gsk4/src/auto/gl_renderer.rs @@ -3,8 +3,6 @@ // DO NOT EDIT use crate::{ffi, Renderer}; -#[cfg(feature = "v4_2")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] use glib::{prelude::*, translate::*}; glib::wrapper! { @@ -17,8 +15,6 @@ glib::wrapper! { } impl GLRenderer { - #[cfg(feature = "v4_2")] - #[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] #[doc(alias = "gsk_gl_renderer_new")] pub fn new() -> GLRenderer { assert_initialized_main_thread!(); diff --git a/gsk4/src/auto/mod.rs b/gsk4/src/auto/mod.rs index ceec153ab0c2..e66540a0530a 100644 --- a/gsk4/src/auto/mod.rs +++ b/gsk4/src/auto/mod.rs @@ -52,7 +52,11 @@ mod fill_node; #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] pub use self::fill_node::FillNode; +#[cfg(feature = "v4_2")] +#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] mod gl_renderer; +#[cfg(feature = "v4_2")] +#[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] pub use self::gl_renderer::GLRenderer; mod gl_shader; diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gsk4/src/auto/versions.txt +++ b/gsk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gsk4/sys/Cargo.toml b/gsk4/sys/Cargo.toml index fa230e453f83..293ecff4974f 100644 --- a/gsk4/sys/Cargo.toml +++ b/gsk4/sys/Cargo.toml @@ -87,7 +87,7 @@ workspace = true workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" [dev-dependencies] shell-words = "1.0.0" diff --git a/gsk4/sys/src/lib.rs b/gsk4/sys/src/lib.rs index d901dd05ebea..905585c5f47e 100644 --- a/gsk4/sys/src/lib.rs +++ b/gsk4/sys/src/lib.rs @@ -1855,6 +1855,8 @@ extern "C" { //========================================================================= // GskGLRenderer //========================================================================= + #[cfg(feature = "v4_2")] + #[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] pub fn gsk_gl_renderer_get_type() -> GType; #[cfg(feature = "v4_2")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gsk4/sys/versions.txt +++ b/gsk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml index 73faa75bf36e..f759093d1c32 100644 --- a/gtk4/Gir.toml +++ b/gtk4/Gir.toml @@ -1025,6 +1025,9 @@ generate_builder = false # use glib::Priority name = "Gtk.DragIcon" status = "generate" generate_builder = false + [[object.function]] + name = "get_for_drag" + rename = "for_drag" [[object]] name = "Gtk.DrawingArea" diff --git a/gtk4/src/auto/drag_icon.rs b/gtk4/src/auto/drag_icon.rs index dfa3af9837b9..2639cdddc178 100644 --- a/gtk4/src/auto/drag_icon.rs +++ b/gtk4/src/auto/drag_icon.rs @@ -20,6 +20,16 @@ glib::wrapper! { } impl DragIcon { + #[doc(alias = "gtk_drag_icon_get_for_drag")] + #[doc(alias = "get_for_drag")] + pub fn for_drag(drag: &gdk::Drag) -> DragIcon { + assert_initialized_main_thread!(); + unsafe { + Widget::from_glib_none(ffi::gtk_drag_icon_get_for_drag(drag.to_glib_none().0)) + .unsafe_cast() + } + } + #[doc(alias = "gtk_drag_icon_get_child")] #[doc(alias = "get_child")] pub fn child(&self) -> Option { @@ -47,13 +57,6 @@ impl DragIcon { } } - #[doc(alias = "gtk_drag_icon_get_for_drag")] - #[doc(alias = "get_for_drag")] - pub fn for_drag(drag: &gdk::Drag) -> Widget { - assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gtk_drag_icon_get_for_drag(drag.to_glib_none().0)) } - } - #[doc(alias = "gtk_drag_icon_set_from_paintable")] pub fn set_from_paintable( drag: &gdk::Drag, diff --git a/gtk4/src/auto/font_dialog_button.rs b/gtk4/src/auto/font_dialog_button.rs index 11c070c1b34b..bba33c941a9f 100644 --- a/gtk4/src/auto/font_dialog_button.rs +++ b/gtk4/src/auto/font_dialog_button.rs @@ -175,6 +175,46 @@ impl FontDialogButton { } } + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + pub fn level(&self) -> FontLevel { + ObjectExt::property(self, "level") + } + + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + pub fn set_level(&self, level: FontLevel) { + ObjectExt::set_property(self, "level", level) + } + + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + #[doc(alias = "use-font")] + pub fn uses_font(&self) -> bool { + ObjectExt::property(self, "use-font") + } + + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + #[doc(alias = "use-font")] + pub fn set_use_font(&self, use_font: bool) { + ObjectExt::set_property(self, "use-font", use_font) + } + + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + #[doc(alias = "use-size")] + pub fn uses_size(&self) -> bool { + ObjectExt::property(self, "use-size") + } + + #[cfg(not(feature = "v4_10"))] + #[cfg_attr(docsrs, doc(cfg(not(feature = "v4_10"))))] + #[doc(alias = "use-size")] + pub fn set_use_size(&self, use_size: bool) { + ObjectExt::set_property(self, "use-size", use_size) + } + #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(alias = "activate")] diff --git a/gtk4/src/auto/graphics_offload.rs b/gtk4/src/auto/graphics_offload.rs index 2abdee6b6ae8..0560b024c49e 100644 --- a/gtk4/src/auto/graphics_offload.rs +++ b/gtk4/src/auto/graphics_offload.rs @@ -99,6 +99,8 @@ impl GraphicsOffload { } } + #[cfg(feature = "v4_16")] + #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))] #[doc(alias = "black-background")] pub fn connect_black_background_notify(&self, f: F) -> SignalHandlerId { unsafe extern "C" fn notify_black_background_trampoline< @@ -199,6 +201,8 @@ impl GraphicsOffloadBuilder { } } + #[cfg(feature = "v4_16")] + #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))] pub fn black_background(self, black_background: bool) -> Self { Self { builder: self.builder.property("black-background", black_background), diff --git a/gtk4/src/auto/image.rs b/gtk4/src/auto/image.rs index 28abb76b8ee8..537fd048daec 100644 --- a/gtk4/src/auto/image.rs +++ b/gtk4/src/auto/image.rs @@ -200,7 +200,6 @@ impl Image { #[cfg_attr(feature = "v4_12", deprecated = "Since 4.12")] #[allow(deprecated)] #[doc(alias = "gtk_image_set_from_pixbuf")] - #[doc(alias = "paintable")] pub fn set_from_pixbuf(&self, pixbuf: Option<&gdk_pixbuf::Pixbuf>) { unsafe { ffi::gtk_image_set_from_pixbuf(self.to_glib_none().0, pixbuf.to_glib_none().0); diff --git a/gtk4/src/auto/list_box.rs b/gtk4/src/auto/list_box.rs index fe67a03e7cc5..bc7270f91bf8 100644 --- a/gtk4/src/auto/list_box.rs +++ b/gtk4/src/auto/list_box.rs @@ -429,19 +429,19 @@ impl ListBox { F: Fn(&ListBox, MovementStep, i32, bool, bool) + 'static, >( this: *mut ffi::GtkListBox, - object: ffi::GtkMovementStep, - p0: libc::c_int, - p1: glib::ffi::gboolean, - p2: glib::ffi::gboolean, + step: ffi::GtkMovementStep, + count: libc::c_int, + extend: glib::ffi::gboolean, + modify: glib::ffi::gboolean, f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); f( &from_glib_borrow(this), - from_glib(object), - p0, - from_glib(p1), - from_glib(p2), + from_glib(step), + count, + from_glib(extend), + from_glib(modify), ) } unsafe { @@ -457,8 +457,8 @@ impl ListBox { } } - pub fn emit_move_cursor(&self, object: MovementStep, p0: i32, p1: bool, p2: bool) { - self.emit_by_name::<()>("move-cursor", &[&object, &p0, &p1, &p2]); + pub fn emit_move_cursor(&self, step: MovementStep, count: i32, extend: bool, modify: bool) { + self.emit_by_name::<()>("move-cursor", &[&step, &count, &extend, &modify]); } #[doc(alias = "row-activated")] diff --git a/gtk4/src/auto/map_list_model.rs b/gtk4/src/auto/map_list_model.rs index 0818d98c9293..46b232272944 100644 --- a/gtk4/src/auto/map_list_model.rs +++ b/gtk4/src/auto/map_list_model.rs @@ -110,7 +110,6 @@ impl MapListModel { } #[doc(alias = "gtk_map_list_model_set_model")] - #[doc(alias = "model")] pub fn set_model(&self, model: Option<&impl IsA>) { unsafe { ffi::gtk_map_list_model_set_model( diff --git a/gtk4/src/auto/notebook.rs b/gtk4/src/auto/notebook.rs index 037a1e68c519..570c3f4a1166 100644 --- a/gtk4/src/auto/notebook.rs +++ b/gtk4/src/auto/notebook.rs @@ -337,11 +337,11 @@ impl Notebook { F: Fn(&Notebook, i32) -> bool + 'static, >( this: *mut ffi::GtkNotebook, - object: libc::c_int, + page: libc::c_int, f: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), object).into_glib() + f(&from_glib_borrow(this), page).into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -356,8 +356,8 @@ impl Notebook { } } - pub fn emit_change_current_page(&self, object: i32) -> bool { - self.emit_by_name("change-current-page", &[&object]) + pub fn emit_change_current_page(&self, page: i32) -> bool { + self.emit_by_name("change-current-page", &[&page]) } #[doc(alias = "create-window")] @@ -399,11 +399,11 @@ impl Notebook { F: Fn(&Notebook, NotebookTab) -> bool + 'static, >( this: *mut ffi::GtkNotebook, - object: ffi::GtkNotebookTab, + tab: ffi::GtkNotebookTab, f: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), from_glib(object)).into_glib() + f(&from_glib_borrow(this), from_glib(tab)).into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -418,8 +418,8 @@ impl Notebook { } } - pub fn emit_focus_tab(&self, object: NotebookTab) -> bool { - self.emit_by_name("focus-tab", &[&object]) + pub fn emit_focus_tab(&self, tab: NotebookTab) -> bool { + self.emit_by_name("focus-tab", &[&tab]) } #[doc(alias = "move-focus-out")] @@ -431,11 +431,11 @@ impl Notebook { F: Fn(&Notebook, DirectionType) + 'static, >( this: *mut ffi::GtkNotebook, - object: ffi::GtkDirectionType, + direction: ffi::GtkDirectionType, f: glib::ffi::gpointer, ) { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), from_glib(object)) + f(&from_glib_borrow(this), from_glib(direction)) } unsafe { let f: Box_ = Box_::new(f); @@ -450,8 +450,8 @@ impl Notebook { } } - pub fn emit_move_focus_out(&self, object: DirectionType) { - self.emit_by_name::<()>("move-focus-out", &[&object]); + pub fn emit_move_focus_out(&self, direction: DirectionType) { + self.emit_by_name::<()>("move-focus-out", &[&direction]); } #[doc(alias = "page-added")] @@ -544,12 +544,17 @@ impl Notebook { F: Fn(&Notebook, DirectionType, bool) -> bool + 'static, >( this: *mut ffi::GtkNotebook, - object: ffi::GtkDirectionType, - p0: glib::ffi::gboolean, + direction: ffi::GtkDirectionType, + move_to_last: glib::ffi::gboolean, f: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), from_glib(object), from_glib(p0)).into_glib() + f( + &from_glib_borrow(this), + from_glib(direction), + from_glib(move_to_last), + ) + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -564,8 +569,8 @@ impl Notebook { } } - pub fn emit_reorder_tab(&self, object: DirectionType, p0: bool) -> bool { - self.emit_by_name("reorder-tab", &[&object, &p0]) + pub fn emit_reorder_tab(&self, direction: DirectionType, move_to_last: bool) -> bool { + self.emit_by_name("reorder-tab", &[&direction, &move_to_last]) } #[doc(alias = "select-page")] @@ -575,11 +580,11 @@ impl Notebook { ) -> SignalHandlerId { unsafe extern "C" fn select_page_trampoline bool + 'static>( this: *mut ffi::GtkNotebook, - object: glib::ffi::gboolean, + move_focus: glib::ffi::gboolean, f: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), from_glib(object)).into_glib() + f(&from_glib_borrow(this), from_glib(move_focus)).into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -594,8 +599,8 @@ impl Notebook { } } - pub fn emit_select_page(&self, object: bool) -> bool { - self.emit_by_name("select-page", &[&object]) + pub fn emit_select_page(&self, move_focus: bool) -> bool { + self.emit_by_name("select-page", &[&move_focus]) } #[doc(alias = "switch-page")] diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gtk4/src/auto/versions.txt +++ b/gtk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665) diff --git a/gtk4/src/auto/widget.rs b/gtk4/src/auto/widget.rs index edefec84fd55..428705811d7d 100644 --- a/gtk4/src/auto/widget.rs +++ b/gtk4/src/auto/widget.rs @@ -949,11 +949,13 @@ pub trait WidgetExt: IsA + sealed::Sealed + 'static { } #[doc(alias = "gtk_widget_is_sensitive")] + #[doc(alias = "sensitive")] fn is_sensitive(&self) -> bool { unsafe { from_glib(ffi::gtk_widget_is_sensitive(self.as_ref().to_glib_none().0)) } } #[doc(alias = "gtk_widget_is_visible")] + #[doc(alias = "visible")] fn is_visible(&self) -> bool { unsafe { from_glib(ffi::gtk_widget_is_visible(self.as_ref().to_glib_none().0)) } } @@ -1325,7 +1327,6 @@ pub trait WidgetExt: IsA + sealed::Sealed + 'static { } #[doc(alias = "gtk_widget_set_parent")] - #[doc(alias = "parent")] fn set_parent(&self, parent: &impl IsA) { unsafe { ffi::gtk_widget_set_parent( diff --git a/gtk4/src/auto/window.rs b/gtk4/src/auto/window.rs index 88198aba8030..694a457f38f1 100644 --- a/gtk4/src/auto/window.rs +++ b/gtk4/src/auto/window.rs @@ -569,6 +569,7 @@ pub trait GtkWindowExt: IsA + sealed::Sealed + 'static { #[doc(alias = "gtk_window_get_focus")] #[doc(alias = "get_focus")] + #[doc(alias = "focus-widget")] fn focus(&self) -> Option { unsafe { from_glib_none(ffi::gtk_window_get_focus(self.as_ref().to_glib_none().0)) } } @@ -690,6 +691,7 @@ pub trait GtkWindowExt: IsA + sealed::Sealed + 'static { } #[doc(alias = "gtk_window_is_fullscreen")] + #[doc(alias = "fullscreened")] fn is_fullscreen(&self) -> bool { unsafe { from_glib(ffi::gtk_window_is_fullscreen( @@ -707,6 +709,7 @@ pub trait GtkWindowExt: IsA + sealed::Sealed + 'static { #[cfg(feature = "v4_12")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))] #[doc(alias = "gtk_window_is_suspended")] + #[doc(alias = "suspended")] fn is_suspended(&self) -> bool { unsafe { from_glib(ffi::gtk_window_is_suspended(self.as_ref().to_glib_none().0)) } } diff --git a/gtk4/sys/Cargo.toml b/gtk4/sys/Cargo.toml index b7a4393f7600..e02f99849416 100644 --- a/gtk4/sys/Cargo.toml +++ b/gtk4/sys/Cargo.toml @@ -107,7 +107,7 @@ workspace = true workspace = true [build-dependencies] -system-deps = "6" +system-deps = "7" [dev-dependencies] shell-words = "1.0.0" diff --git a/gtk4/sys/src/lib.rs b/gtk4/sys/src/lib.rs index d419f1c7c049..c6d877a09310 100644 --- a/gtk4/sys/src/lib.rs +++ b/gtk4/sys/src/lib.rs @@ -12961,8 +12961,8 @@ extern "C" { // GtkDragIcon //========================================================================= pub fn gtk_drag_icon_get_type() -> GType; - pub fn gtk_drag_icon_create_widget_for_value(value: *const gobject::GValue) -> *mut GtkWidget; pub fn gtk_drag_icon_get_for_drag(drag: *mut gdk::GdkDrag) -> *mut GtkWidget; + pub fn gtk_drag_icon_create_widget_for_value(value: *const gobject::GValue) -> *mut GtkWidget; pub fn gtk_drag_icon_set_from_paintable( drag: *mut gdk::GdkDrag, paintable: *mut gdk::GdkPaintable, diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt index e76500e1e9d5..e54892f19a98 100644 --- a/gtk4/sys/versions.txt +++ b/gtk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ d26d8f60b97d) -from gir-files (https://github.com/gtk-rs/gir-files @ 74aa91d9063d) +Generated by gir (https://github.com/gtk-rs/gir @ cbffeb655c48) +from gir-files (https://github.com/gtk-rs/gir-files @ 85cf3aab5665)