gtk: Use glib enums instead of bools where it makes sense

examples/femtovg_area/femtovg_area/imp.rs

@@ -80,7 +80,7 @@ impl GLAreaImpl for FemtoVGArea {
             self.obj().scale_factor() as f32,
         );
     }
-    fn render(&self, _context: &gtk::gdk::GLContext) -> bool {
+    fn render(&self, _context: &gtk::gdk::GLContext) -> glib::Propagation {
         use femtovg::{Color, Paint, Path};
 
         self.ensure_canvas();
@@ -126,7 +126,7 @@ impl GLAreaImpl for FemtoVGArea {
         canvas.stroke_path(&mut path, &paint);
         canvas.flush();
 
-        true
+        glib::Propagation::Stop
     }
 }
 impl FemtoVGArea {

examples/glium_gl_area/glium_gl_area/imp.rs

@@ -171,9 +171,9 @@ impl WidgetImpl for GliumGLArea {
 }
 
 impl GLAreaImpl for GliumGLArea {
-    fn render(&self, _context: &gtk::gdk::GLContext) -> bool {
+    fn render(&self, _context: &gtk::gdk::GLContext) -> glib::Propagation {
         self.renderer.borrow().as_ref().unwrap().draw();
 
-        true
+        glib::Propagation::Stop
     }
 }

examples/list_box_model/list_box_row/imp.rs

@@ -103,7 +103,7 @@ impl ObjectImpl for ListBoxRow {
                 .build();
             content_area.append(&spin_button);
 
-            dialog.show()
+            dialog.present()
         }));
         hbox.append(&edit_button);
 

examples/list_box_model/main.rs

@@ -94,7 +94,7 @@ fn build_ui(application: &gtk::Application) {
             dialog.close();
         }));
 
-        dialog.show()
+        dialog.present()
     }));
 
     hbox.append(&add_button);

gdk4-wayland/Cargo.toml

@@ -31,8 +31,8 @@ gdk = {path = "../gdk4", package = "gdk4", version = "0.8"}
 gio = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
 glib = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.19", features = ["v2_66"]}
 libc = "0.2"
-wayland-client = {version = "0.30.0", optional = true}
-wayland-backend = {version = "0.1.0", optional = true, features = ["client_system"]}
+wayland-client = {version = "0.31.0", optional = true}
+wayland-backend = {version = "0.3.0", optional = true, features = ["client_system"]}
 khronos-egl = {version = "6.0", optional = true}
 xkb = {version = "0.3", optional = true}
 

gdk4-wayland/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4-wayland/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4-win32/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4-win32/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4-x11/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4-x11/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gdk4/src/surface.rs

@@ -28,6 +28,7 @@ pub trait SurfaceExtManual: sealed::Sealed + IsA<Surface> + 'static {
         }
     }
 
+    // Returns true if the coordinates were successfully translated
     #[doc(alias = "gdk_surface_translate_coordinates")]
     fn translate_coordinates(&self, to: &Surface, mut x: f64, mut y: f64) -> bool {
         unsafe {

gdk4/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gsk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gsk4/src/path.rs

@@ -5,14 +5,14 @@ use glib::translate::*;
 
 impl Path {
     #[doc(alias = "gsk_path_foreach")]
-    pub fn foreach<P: FnMut(&PathOperation, &graphene::Point, usize, f32) -> bool>(
+    pub fn foreach<P: FnMut(&PathOperation, &graphene::Point, usize, f32) -> glib::ControlFlow>(
         &self,
         flags: PathForeachFlags,
         func: P,
-    ) -> bool {
+    ) -> glib::ControlFlow {
         let func_data: P = func;
         unsafe extern "C" fn func_func<
-            P: FnMut(&PathOperation, &graphene::Point, usize, f32) -> bool,
+            P: FnMut(&PathOperation, &graphene::Point, usize, f32) -> glib::ControlFlow,
         >(
             op: ffi::GskPathOperation,
             pts: *const graphene::ffi::graphene_point_t,

gsk4/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gtk4/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 133ee1d93c85)
-from gir-files (https://github.com/gtk-rs/gir-files @ 326eb5f2d5d8)
+Generated by gir (https://github.com/gtk-rs/gir @ 428c880ecf0b)
+from gir-files (https://github.com/gtk-rs/gir-files @ 20031a537e40)

gtk4/src/auto/window.rs

@@ -1,6 +1,7 @@
 // This file was generated by gir (https://github.com/gtk-rs/gir)
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
+#![allow(deprecated)]
 
 use crate::{
     Accessible, AccessibleRole, Align, Application, Buildable, ConstraintTarget, LayoutManager,
@@ -717,6 +718,8 @@ pub trait GtkWindowExt: IsA<Window> + sealed::Sealed + 'static {
         }
     }
 
+    #[cfg_attr(feature = "v4_14", deprecated = "Since 4.14")]
+    #[allow(deprecated)]
     #[doc(alias = "gtk_window_present_with_time")]
     fn present_with_time(&self, timestamp: u32) {
         unsafe {

gtk4/src/drop_target.rs

@@ -45,6 +45,7 @@ impl DropTarget {
         }
     }
 
+    // Returns true if the drop was accepted
     pub fn connect_drop<F: Fn(&DropTarget, &glib::Value, f64, f64) -> bool + 'static>(
         &self,
         f: F,

gtk4/src/shortcuts_section.rs

@@ -8,11 +8,22 @@ use glib::{
 use std::mem::transmute;
 
 impl ShortcutsSection {
+    // todo: figure out what the bool return value here corresponds to
     pub fn connect_change_current_page<F: Fn(&ShortcutsSection, i32) -> bool + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
         unsafe {
+            unsafe extern "C" fn change_current_page_trampoline<
+                F: Fn(&ShortcutsSection, i32) -> bool + 'static,
+            >(
+                this: *mut ffi::GtkShortcutsSection,
+                object: 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()
+            }
             let f = Box::new(f);
             connect_raw(
                 self.as_ptr() as *mut _,
@@ -27,14 +38,3 @@ impl ShortcutsSection {
         self.emit_by_name("change-current-page", &[&object])
     }
 }
-
-unsafe extern "C" fn change_current_page_trampoline<
-    F: Fn(&ShortcutsSection, i32) -> bool + 'static,
->(
-    this: *mut ffi::GtkShortcutsSection,
-    object: 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()
-}

gtk4/src/subclass/accessible_range.rs

@@ -18,6 +18,7 @@ mod sealed {
 }
 
 pub trait AccessibleRangeImplExt: sealed::Sealed + ObjectSubclass {
+    // Returns true if the operation was performed, false otherwise
     fn parent_set_current_value(&self, accessible_range: &Self::Type, value: f64) -> bool {
         unsafe {
             let type_data = Self::type_data();

gtk4/src/subclass/cell_area.rs

@@ -17,16 +17,15 @@ pub struct CellCallback {
 }
 
 impl CellCallback {
-    pub fn call<R: IsA<CellRenderer>>(&self, cell_renderer: &R) -> bool {
+    pub fn call<R: IsA<CellRenderer>>(&self, cell_renderer: &R) -> glib::ControlFlow {
         unsafe {
             if let Some(callback) = self.callback {
                 from_glib(callback(
                     cell_renderer.as_ref().to_glib_none().0,
                     self.user_data,
                 ))
             } else {
-                // true to stop iterating over cells
-                true
+                glib::ControlFlow::Break
             }
         }
     }
@@ -44,7 +43,7 @@ impl CellCallbackAllocate {
         cell_renderer: &R,
         cell_area: &gdk::Rectangle,
         cell_background: &gdk::Rectangle,
-    ) -> bool {
+    ) -> glib::ControlFlow {
         unsafe {
             if let Some(callback) = self.callback {
                 from_glib(callback(
@@ -54,8 +53,7 @@ impl CellCallbackAllocate {
                     self.user_data,
                 ))
             } else {
-                // true to stop iterating over cells
-                true
+                glib::ControlFlow::Break
             }
         }
     }
@@ -227,6 +225,7 @@ mod sealed {
 #[cfg_attr(feature = "v4_10", deprecated = "Since 4.10")]
 #[allow(deprecated)]
 pub trait CellAreaImplExt: sealed::Sealed + ObjectSubclass {
+    // Returns true if the area was successfully activated
     fn parent_activate<P: IsA<CellAreaContext>, W: IsA<Widget>>(
         &self,
         context: &P,
@@ -317,6 +316,7 @@ pub trait CellAreaImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // returns true only if the event is handled
     fn parent_event<W: IsA<Widget>, P: IsA<CellAreaContext>>(
         &self,
         context: &P,
@@ -338,7 +338,6 @@ pub trait CellAreaImplExt: sealed::Sealed + ObjectSubclass {
                     flags.into_glib(),
                 ))
             } else {
-                // returns true only if the event is handled
                 false
             }
         }
@@ -396,6 +395,7 @@ pub trait CellAreaImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Whether the cell is activatable
     fn parent_is_activatable(&self) -> bool {
         unsafe {
             let data = Self::type_data();
@@ -408,6 +408,7 @@ pub trait CellAreaImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // TRUE if focus remains inside area as a result of this call.
     fn parent_focus(&self, direction_type: DirectionType) -> bool {
         unsafe {
             let data = Self::type_data();

gtk4/src/subclass/cell_renderer.rs

@@ -257,6 +257,7 @@ pub trait CellRendererImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Returns true if the event was consumed/handled
     fn parent_activate<P: IsA<Widget>>(
         &self,
         event: Option<&gdk::Event>,

gtk4/src/subclass/font_chooser.rs

@@ -17,6 +17,7 @@ pub struct FilterCallback {
 }
 
 impl FilterCallback {
+    // true if the font should be displayed
     pub fn call(&self, font_family: &FontFamily, font_face: &FontFace) -> bool {
         unsafe {
             if let Some(filter_func) = self.filter_func {

gtk4/src/subclass/gl_area.rs

@@ -13,7 +13,7 @@ pub trait GLAreaImpl: GLAreaImplExt + WidgetImpl {
         self.parent_create_context()
     }
 
-    fn render(&self, context: &GLContext) -> bool {
+    fn render(&self, context: &GLContext) -> glib::Propagation {
         self.parent_render(context)
     }
 
@@ -44,7 +44,7 @@ pub trait GLAreaImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
-    fn parent_render(&self, context: &GLContext) -> bool {
+    fn parent_render(&self, context: &GLContext) -> glib::Propagation {
         unsafe {
             let data = Self::type_data();
             let parent_class = data.as_ref().parent_class() as *mut ffi::GtkGLAreaClass;

gtk4/src/subclass/im_context.rs

@@ -88,6 +88,7 @@ pub trait IMContextImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Returns true if the signal was handled
     fn parent_delete_surrounding(&self, offset: i32, n_chars: i32) -> bool {
         unsafe {
             let data = Self::type_data();
@@ -99,12 +100,12 @@ pub trait IMContextImplExt: sealed::Sealed + ObjectSubclass {
                     n_chars,
                 ))
             } else {
-                // Returns true if the signal was handled
                 false
             }
         }
     }
 
+    // Returns true if the event was consumed
     fn parent_filter_keypress(&self, event: &gdk::Event) -> bool {
         unsafe {
             let data = Self::type_data();
@@ -115,7 +116,6 @@ pub trait IMContextImplExt: sealed::Sealed + ObjectSubclass {
                     event.to_glib_none().0,
                 ))
             } else {
-                // Returns true if the event was consumed
                 false
             }
         }
@@ -225,6 +225,7 @@ pub trait IMContextImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Returns true if the signal was handled
     fn parent_retrieve_surrounding(&self) -> bool {
         unsafe {
             let data = Self::type_data();
@@ -236,7 +237,6 @@ pub trait IMContextImplExt: sealed::Sealed + ObjectSubclass {
                     .to_glib_none()
                     .0))
             } else {
-                // Returns true if the signal was handled
                 false
             }
         }

gtk4/src/subclass/media_stream.rs

@@ -49,6 +49,7 @@ pub trait MediaStreamImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Returns true if successfully started playing
     fn parent_play(&self) -> bool {
         unsafe {
             let data = Self::type_data();

gtk4/src/subclass/print_operation.rs

@@ -164,6 +164,7 @@ pub trait PrintOperationImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // Returns true if pagination is complete
     fn parent_paginate(&self, context: &PrintContext) -> bool {
         unsafe {
             let data = Self::type_data();
@@ -183,6 +184,7 @@ pub trait PrintOperationImplExt: sealed::Sealed + ObjectSubclass {
         }
     }
 
+    // true if the listener wants to take over control of the preview.
     fn parent_preview(
         &self,
         preview: &PrintOperationPreview,