Regenerate with latest gir/gir-files

examples/dialog/main.rs

@@ -1,4 +1,4 @@
-use gtk::glib::{self, clone, ControlFlow};
+use gtk::glib::{self, clone};
 use gtk::prelude::*;
 
 use std::rc::Rc;
@@ -40,7 +40,7 @@ fn build_ui(application: &gtk::Application) {
  if let Some(application) = window.application() {
  application.remove_window(window);
  }
- ControlFlow::Break
+ glib::Propagation::Proceed
  });
 }
 

gdk4-wayland/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4-wayland/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4-win32/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4-win32/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4-x11/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4-x11/src/x11_display.rs

@@ -68,12 +68,12 @@ impl X11Display {
  #[cfg(any(feature = "xlib", docsrs))]
  #[cfg_attr(docsrs, doc(cfg(feature = "xlib")))]
  #[doc(alias = "xevent")]
- pub unsafe fn connect_xevent<F: Fn(&Self, *mut xlib::XEvent) -> glib::ControlFlow + 'static>(
+ pub unsafe fn connect_xevent<F: Fn(&Self, *mut xlib::XEvent) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn xevent_trampoline<
- F: Fn(&X11Display, *mut xlib::XEvent) -> glib::ControlFlow + 'static,
+ F: Fn(&X11Display, *mut xlib::XEvent) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GdkX11Display,
  xevent: glib::ffi::gpointer,

gdk4-x11/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4/Gir.toml

@@ -551,7 +551,7 @@ status = "generate"
  name = "r32g32b32a32_float"
  version = "4.6"
  [[object.member]]
- pattern = "(g8a8_premultiplied|g8a8|g8|g16a16_premultiplied|g16a16|g16|a8|a16)"
+ pattern = "(g8a8_premultiplied|g8a8|g8|g16a16_premultiplied|g16a16|g16|a8|a16|a16_float|a32_float)"
  version = "4.12"
  [[object.member]]
  name = "n_formats"

gdk4/src/auto/enums.rs

@@ -1665,6 +1665,14 @@ pub enum MemoryFormat {
  #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
  #[doc(alias = "GDK_MEMORY_A16")]
  A16,
+ #[cfg(feature = "v4_12")]
+ #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
+ #[doc(alias = "GDK_MEMORY_A16_FLOAT")]
+ A16Float,
+ #[cfg(feature = "v4_12")]
+ #[cfg_attr(docsrs, doc(cfg(feature = "v4_12")))]
+ #[doc(alias = "GDK_MEMORY_A32_FLOAT")]
+ A32Float,
  #[doc(hidden)]
  __Unknown(i32),
 }
@@ -1718,6 +1726,10 @@ impl fmt::Display for MemoryFormat {
  Self::A8 => "A8",
  #[cfg(feature = "v4_12")]
  Self::A16 => "A16",
+ #[cfg(feature = "v4_12")]
+ Self::A16Float => "A16Float",
+ #[cfg(feature = "v4_12")]
+ Self::A32Float => "A32Float",
  _ => "Unknown",
  }
  )
@@ -1777,6 +1789,10 @@ impl IntoGlib for MemoryFormat {
  Self::A8 => ffi::GDK_MEMORY_A8,
  #[cfg(feature = "v4_12")]
  Self::A16 => ffi::GDK_MEMORY_A16,
+ #[cfg(feature = "v4_12")]
+ Self::A16Float => ffi::GDK_MEMORY_A16_FLOAT,
+ #[cfg(feature = "v4_12")]
+ Self::A32Float => ffi::GDK_MEMORY_A32_FLOAT,
  Self::__Unknown(value) => value,
  }
  }
@@ -1835,6 +1851,10 @@ impl FromGlib<ffi::GdkMemoryFormat> for MemoryFormat {
  ffi::GDK_MEMORY_A8 => Self::A8,
  #[cfg(feature = "v4_12")]
  ffi::GDK_MEMORY_A16 => Self::A16,
+ #[cfg(feature = "v4_12")]
+ ffi::GDK_MEMORY_A16_FLOAT => Self::A16Float,
+ #[cfg(feature = "v4_12")]
+ ffi::GDK_MEMORY_A32_FLOAT => Self::A32Float,
  value => Self::__Unknown(value),
  }
  }

gdk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gdk4/sys/src/lib.rs

@@ -163,7 +163,9 @@ pub const GDK_MEMORY_G16A16: GdkMemoryFormat = 22;
 pub const GDK_MEMORY_G16: GdkMemoryFormat = 23;
 pub const GDK_MEMORY_A8: GdkMemoryFormat = 24;
 pub const GDK_MEMORY_A16: GdkMemoryFormat = 25;
-pub const GDK_MEMORY_N_FORMATS: GdkMemoryFormat = 26;
+pub const GDK_MEMORY_A16_FLOAT: GdkMemoryFormat = 26;
+pub const GDK_MEMORY_A32_FLOAT: GdkMemoryFormat = 27;
+pub const GDK_MEMORY_N_FORMATS: GdkMemoryFormat = 28;
 
 pub type GdkNotifyType = c_int;
 pub const GDK_NOTIFY_ANCESTOR: GdkNotifyType = 0;

gdk4/sys/tests/abi.rs

@@ -2865,6 +2865,8 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
  ("(gint) GDK_LEAVE_NOTIFY", "7"),
  ("(guint) GDK_LOCK_MASK", "2"),
  ("(gint) GDK_MEMORY_A16", "25"),
+ ("(gint) GDK_MEMORY_A16_FLOAT", "26"),
+ ("(gint) GDK_MEMORY_A32_FLOAT", "27"),
  ("(gint) GDK_MEMORY_A8", "24"),
  ("(gint) GDK_MEMORY_A8B8G8R8", "6"),
  ("(gint) GDK_MEMORY_A8R8G8B8", "4"),
@@ -2878,7 +2880,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
  ("(gint) GDK_MEMORY_G8", "20"),
  ("(gint) GDK_MEMORY_G8A8", "19"),
  ("(gint) GDK_MEMORY_G8A8_PREMULTIPLIED", "18"),
- ("(gint) GDK_MEMORY_N_FORMATS", "26"),
+ ("(gint) GDK_MEMORY_N_FORMATS", "28"),
  ("(gint) GDK_MEMORY_R16G16B16", "9"),
  ("(gint) GDK_MEMORY_R16G16B16A16", "11"),
  ("(gint) GDK_MEMORY_R16G16B16A16_FLOAT", "14"),

gdk4/sys/tests/constant.c

@@ -2427,6 +2427,8 @@ int main() {
  PRINT_CONSTANT((gint) GDK_LEAVE_NOTIFY);
  PRINT_CONSTANT((guint) GDK_LOCK_MASK);
  PRINT_CONSTANT((gint) GDK_MEMORY_A16);
+ PRINT_CONSTANT((gint) GDK_MEMORY_A16_FLOAT);
+ PRINT_CONSTANT((gint) GDK_MEMORY_A32_FLOAT);
  PRINT_CONSTANT((gint) GDK_MEMORY_A8);
  PRINT_CONSTANT((gint) GDK_MEMORY_A8B8G8R8);
  PRINT_CONSTANT((gint) GDK_MEMORY_A8R8G8B8);

gdk4/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gsk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gsk4/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ c88b69265102)
-from gir-files (https://github.com/gtk-rs/gir-files @ c23f21f51d54)
+Generated by gir (https://github.com/gtk-rs/gir @ ef087c070d5b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 1dc6c3826666)

gtk4/src/auto/about_dialog.rs

@@ -315,12 +315,12 @@ impl AboutDialog {
  }
 
  #[doc(alias = "activate-link")]
- pub fn connect_activate_link<F: Fn(&Self, &str) -> glib::ControlFlow + 'static>(
+ pub fn connect_activate_link<F: Fn(&Self, &str) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn activate_link_trampoline<
- F: Fn(&AboutDialog, &str) -> glib::ControlFlow + 'static,
+ F: Fn(&AboutDialog, &str) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkAboutDialog,
  uri: *mut libc::c_char,

gtk4/src/auto/entry_completion.rs

@@ -315,13 +315,13 @@ impl EntryCompletion {
 
  #[doc(alias = "cursor-on-match")]
  pub fn connect_cursor_on_match<
- F: Fn(&Self, &TreeModel, &TreeIter) -> glib::ControlFlow + 'static,
+ F: Fn(&Self, &TreeModel, &TreeIter) -> glib::Propagation + 'static,
  >(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn cursor_on_match_trampoline<
- F: Fn(&EntryCompletion, &TreeModel, &TreeIter) -> glib::ControlFlow + 'static,
+ F: Fn(&EntryCompletion, &TreeModel, &TreeIter) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEntryCompletion,
  model: *mut ffi::GtkTreeModel,
@@ -350,12 +350,12 @@ impl EntryCompletion {
  }
 
  #[doc(alias = "insert-prefix")]
- pub fn connect_insert_prefix<F: Fn(&Self, &str) -> glib::ControlFlow + 'static>(
+ pub fn connect_insert_prefix<F: Fn(&Self, &str) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn insert_prefix_trampoline<
- F: Fn(&EntryCompletion, &str) -> glib::ControlFlow + 'static,
+ F: Fn(&EntryCompletion, &str) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEntryCompletion,
  prefix: *mut libc::c_char,
@@ -383,13 +383,13 @@ impl EntryCompletion {
 
  #[doc(alias = "match-selected")]
  pub fn connect_match_selected<
- F: Fn(&Self, &TreeModel, &TreeIter) -> glib::ControlFlow + 'static,
+ F: Fn(&Self, &TreeModel, &TreeIter) -> glib::Propagation + 'static,
  >(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn match_selected_trampoline<
- F: Fn(&EntryCompletion, &TreeModel, &TreeIter) -> glib::ControlFlow + 'static,
+ F: Fn(&EntryCompletion, &TreeModel, &TreeIter) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEntryCompletion,
  model: *mut ffi::GtkTreeModel,

gtk4/src/auto/event_controller_key.rs

@@ -95,12 +95,12 @@ impl EventControllerKey {
  }
 
  #[doc(alias = "modifiers")]
- pub fn connect_modifiers<F: Fn(&Self, gdk::ModifierType) -> glib::ControlFlow + 'static>(
+ pub fn connect_modifiers<F: Fn(&Self, gdk::ModifierType) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn modifiers_trampoline<
- F: Fn(&EventControllerKey, gdk::ModifierType) -> glib::ControlFlow + 'static,
+ F: Fn(&EventControllerKey, gdk::ModifierType) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEventControllerKey,
  state: gdk::ffi::GdkModifierType,

gtk4/src/auto/event_controller_legacy.rs

@@ -37,12 +37,12 @@ impl EventControllerLegacy {
  }
 
  #[doc(alias = "event")]
- pub fn connect_event<F: Fn(&Self, &gdk::Event) -> glib::ControlFlow + 'static>(
+ pub fn connect_event<F: Fn(&Self, &gdk::Event) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn event_trampoline<
- F: Fn(&EventControllerLegacy, &gdk::Event) -> glib::ControlFlow + 'static,
+ F: Fn(&EventControllerLegacy, &gdk::Event) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEventControllerLegacy,
  event: *mut gdk::ffi::GdkEvent,

gtk4/src/auto/event_controller_scroll.rs

@@ -93,12 +93,12 @@ impl EventControllerScroll {
  }
 
  #[doc(alias = "scroll")]
- pub fn connect_scroll<F: Fn(&Self, f64, f64) -> glib::ControlFlow + 'static>(
+ pub fn connect_scroll<F: Fn(&Self, f64, f64) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn scroll_trampoline<
- F: Fn(&EventControllerScroll, f64, f64) -> glib::ControlFlow + 'static,
+ F: Fn(&EventControllerScroll, f64, f64) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkEventControllerScroll,
  dx: libc::c_double,

gtk4/src/auto/flags.rs

@@ -316,8 +316,6 @@ bitflags! {
  const NO_CSS_CACHE = ffi::GTK_DEBUG_NO_CSS_CACHE as _;
  #[doc(alias = "GTK_DEBUG_INTERACTIVE")]
  const INTERACTIVE = ffi::GTK_DEBUG_INTERACTIVE as _;
- #[doc(alias = "GTK_DEBUG_TOUCHSCREEN")]
- const TOUCHSCREEN = ffi::GTK_DEBUG_TOUCHSCREEN as _;
  #[doc(alias = "GTK_DEBUG_ACTIONS")]
  const ACTIONS = ffi::GTK_DEBUG_ACTIONS as _;
  #[doc(alias = "GTK_DEBUG_LAYOUT")]

gtk4/src/auto/gl_area.rs

@@ -492,13 +492,13 @@ pub trait GLAreaExt: IsA<GLArea> + sealed::Sealed + 'static {
  }
 
  #[doc(alias = "render")]
- fn connect_render<F: Fn(&Self, &gdk::GLContext) -> glib::ControlFlow + 'static>(
+ fn connect_render<F: Fn(&Self, &gdk::GLContext) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn render_trampoline<
  P: IsA<GLArea>,
- F: Fn(&P, &gdk::GLContext) -> glib::ControlFlow + 'static,
+ F: Fn(&P, &gdk::GLContext) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkGLArea,
  context: *mut gdk::ffi::GdkGLContext,

gtk4/src/auto/label.rs

@@ -428,12 +428,12 @@ impl Label {
  }
 
  #[doc(alias = "activate-link")]
- pub fn connect_activate_link<F: Fn(&Self, &str) -> glib::ControlFlow + 'static>(
+ pub fn connect_activate_link<F: Fn(&Self, &str) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn activate_link_trampoline<
- F: Fn(&Label, &str) -> glib::ControlFlow + 'static,
+ F: Fn(&Label, &str) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkLabel,
  uri: *mut libc::c_char,

gtk4/src/auto/link_button.rs

@@ -79,12 +79,12 @@ impl LinkButton {
  }
 
  #[doc(alias = "activate-link")]
- pub fn connect_activate_link<F: Fn(&Self) -> glib::ControlFlow + 'static>(
+ pub fn connect_activate_link<F: Fn(&Self) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn activate_link_trampoline<
- F: Fn(&LinkButton) -> glib::ControlFlow + 'static,
+ F: Fn(&LinkButton) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkLinkButton,
  f: glib::ffi::gpointer,

gtk4/src/auto/range.rs

@@ -255,13 +255,13 @@ pub trait RangeExt: IsA<Range> + sealed::Sealed + 'static {
  }
 
  #[doc(alias = "change-value")]
- fn connect_change_value<F: Fn(&Self, ScrollType, f64) -> glib::ControlFlow + 'static>(
+ fn connect_change_value<F: Fn(&Self, ScrollType, f64) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn change_value_trampoline<
  P: IsA<Range>,
- F: Fn(&P, ScrollType, f64) -> glib::ControlFlow + 'static,
+ F: Fn(&P, ScrollType, f64) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkRange,
  scroll: ffi::GtkScrollType,

gtk4/src/auto/spin_button.rs

@@ -304,12 +304,12 @@ impl SpinButton {
  }
 
  #[doc(alias = "output")]
- pub fn connect_output<F: Fn(&Self) -> glib::ControlFlow + 'static>(
+ pub fn connect_output<F: Fn(&Self) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn output_trampoline<
- F: Fn(&SpinButton) -> glib::ControlFlow + 'static,
+ F: Fn(&SpinButton) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkSpinButton,
  f: glib::ffi::gpointer,

gtk4/src/auto/switch.rs

@@ -90,12 +90,12 @@ impl Switch {
  }
 
  #[doc(alias = "state-set")]
- pub fn connect_state_set<F: Fn(&Self, bool) -> glib::ControlFlow + 'static>(
+ pub fn connect_state_set<F: Fn(&Self, bool) -> glib::Propagation + 'static>(
  &self,
  f: F,
  ) -> SignalHandlerId {
  unsafe extern "C" fn state_set_trampoline<
- F: Fn(&Switch, bool) -> glib::ControlFlow + 'static,
+ F: Fn(&Switch, bool) -> glib::Propagation + 'static,
  >(
  this: *mut ffi::GtkSwitch,
  state: glib::ffi::gboolean,