Adapt to renamed glib::Continue

Author: bilelmoussaoui

examples/clock/main.rs

@@ -28,8 +28,8 @@ fn build_ui(application: &Application) {
     let tick = move || {
         let time = current_time();
         label.set_text(&time);
-        // we could return gtk::Continue(false) to stop our clock after this tick
-        glib::Continue(true)
+        // we could return glib::ControlFlow::Break to stop our clock after this tick
+        glib::ControlFlow::Continue
     };
 
     // executes the closure once every second

examples/confetti_snapshot_animation/animated_explosion/mod.rs

@@ -23,8 +23,8 @@ impl AnimatedExplosion {
         imp.lastupdate.replace(time);
         imp.duration.replace(duration);
     }
-    // Returns glib::source::Continue(false) if the animation is finished
-    pub(super) fn update(&self, clock: &gdk::FrameClock) -> Continue {
+    // Returns glib::ControlFlow::Break if the animation is finished
+    pub(super) fn update(&self, clock: &gdk::FrameClock) -> glib::ControlFlow {
         let imp = self.imp();
 
         // Time tracking to correctly update the physics simulation.
@@ -41,7 +41,7 @@ impl AnimatedExplosion {
         if !imp.finished.get() && time - imp.start.get() >= imp.duration.get() {
             imp.finished.replace(true);
         }
-        Continue(!imp.finished.get())
+        glib::ControlFlow::from(!imp.finished.get())
     }
 
     pub(super) fn draw(&self, snapshot: &gtk::Snapshot) {

examples/confetti_snapshot_animation/confetti_widget/mod.rs

@@ -1,8 +1,8 @@
 mod imp;
 
 use crate::{AnimatedExplosion, ExplosionParameters};
-use glib::clone;
 use glib::subclass::prelude::*;
+use glib::{clone, ControlFlow};
 use gtk::glib;
 use gtk::prelude::*;
 
@@ -30,10 +30,10 @@ impl ConfettiWidget {
 
         frame_clock.connect_update(clone!(@weak self as this, @weak exp => move |clock| {
             match exp.update(clock) {
-                Continue(true) => {
+                ControlFlow::Continue => {
                     this.queue_draw();
                 },
-                Continue(false) => {
+                ControlFlow::Break => {
                     this.imp().explosions.borrow_mut().remove(&exp);
                     clock.end_updating();
                 }

examples/custom_layout_manager/simple_widget/mod.rs

@@ -41,7 +41,7 @@ impl SimpleWidget {
         imp.tick_id.replace(Some(tick_id));
     }
 
-    pub fn transition(&self) -> glib::Continue {
+    pub fn transition(&self) -> glib::ControlFlow {
         let imp = self.imp();
         let now = std::time::Instant::now();
         self.queue_allocate();
@@ -73,9 +73,9 @@ impl SimpleWidget {
                 layout_manager.set_position(0.0);
             }
             let _ = imp.tick_id.borrow_mut().take();
-            return glib::Continue(false);
+            return glib::ControlFlow::Break;
         }
 
-        glib::Continue(true)
+        glib::ControlFlow::Continue
     }
 }

examples/femtovg_area/femtovg_area/imp.rs

@@ -41,7 +41,7 @@ impl ObjectImpl for FemtoVGArea {
         area.set_has_stencil_buffer(true);
         area.add_tick_callback(|area, _| {
             area.queue_render();
-            glib::Continue(true)
+            glib::ControlFlow::Continue
         });
         let click = gtk::GestureClick::new();
         let a = area.clone();

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::Continue + 'static>(
+    pub unsafe fn connect_xevent<F: Fn(&Self, *mut xlib::XEvent) -> glib::ControlFlow + 'static>(
         &self,
         f: F,
     ) -> SignalHandlerId {
         unsafe extern "C" fn xevent_trampoline<
-            F: Fn(&X11Display, *mut xlib::XEvent) -> glib::Continue + 'static,
+            F: Fn(&X11Display, *mut xlib::XEvent) -> glib::ControlFlow + 'static,
         >(
             this: *mut ffi::GdkX11Display,
             xevent: glib::ffi::gpointer,

gtk4/src/widget.rs

@@ -2,7 +2,7 @@
 
 use crate::{prelude::*, Widget};
 
-use glib::{translate::*, Continue, WeakRef};
+use glib::{translate::*, ControlFlow, WeakRef};
 
 mod sealed {
     pub trait Sealed {}
@@ -13,15 +13,15 @@ mod sealed {
 /// Trait containing manually implemented methods of [`Widget`](crate::Widget).
 pub trait WidgetExtManual: sealed::Sealed + IsA<Widget> + 'static {
     #[doc(alias = "gtk_widget_add_tick_callback")]
-    fn add_tick_callback<P: Fn(&Self, &gdk::FrameClock) -> Continue + 'static>(
+    fn add_tick_callback<P: Fn(&Self, &gdk::FrameClock) -> ControlFlow + 'static>(
         &self,
         callback: P,
     ) -> TickCallbackId {
         let callback_data: Box<P> = Box::new(callback);
 
         unsafe extern "C" fn callback_func<
             O: IsA<Widget>,
-            P: Fn(&O, &gdk::FrameClock) -> Continue + 'static,
+            P: Fn(&O, &gdk::FrameClock) -> ControlFlow + 'static,
         >(
             widget: *mut ffi::GtkWidget,
             frame_clock: *mut gdk::ffi::GdkFrameClock,
@@ -37,7 +37,7 @@ pub trait WidgetExtManual: sealed::Sealed + IsA<Widget> + 'static {
 
         unsafe extern "C" fn notify_func<
             O: IsA<Widget>,
-            P: Fn(&O, &gdk::FrameClock) -> Continue + 'static,
+            P: Fn(&O, &gdk::FrameClock) -> ControlFlow + 'static,
         >(
             data: glib::ffi::gpointer,
         ) {