[vibe coded] updated gtk crate and friends

Cargo.toml

@@ -12,14 +12,16 @@ version = "0.24.1"
 edition = "2018"
 
 [dependencies]
-cairo-rs = "0.16.1"
+cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 fragile = "2.0"
-glib = "0.16.2"
-glib-sys = "0.16.0"
-gobject-sys = "0.16.0"
-gtk = "0.16.1"
+gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
+glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
+glib-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" }
+gobject-sys = { git = "https://github.com/gtk-rs/gtk-rs-core" }
+gtk = { git = "https://github.com/nikescar/gtk3-rs.git", version = "0.19.0" }
 libc = "^0.2.54"
 log = "^0.4.6"
+target-lexicon = "0.13.3"
 
 [features]
 hidpi = []

src/container.rs

@@ -19,7 +19,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use glib::{Cast, IsA, Object};
+use glib::Object;
+use glib::prelude::{Cast, IsA};
 use gtk::{prelude::ContainerExt, prelude::WidgetExt};
 
 use crate::state::EventStream;

src/core/source.rs

@@ -19,7 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use std::mem;
+use std::mem::{self, size_of};
 use std::os::raw::c_int;
 use std::ptr;
 
@@ -51,7 +51,7 @@ pub fn new_source<T: SourceFuncs>(data: T) -> Source {
         funcs.dispatch = Some(dispatch::<T>);
         funcs.finalize = Some(finalize::<T>);
         let mut funcs = Box::new(funcs);
-        let source = g_source_new(&mut *funcs, mem::size_of::<SourceData<T>>() as u32);
+        let source = g_source_new(&mut *funcs, size_of::<SourceData<T>>() as u32);
         ptr::write(&mut (*(source as *mut SourceData<T>)).data, data);
         ptr::write(&mut (*(source as *mut SourceData<T>)).funcs, funcs);
         from_glib_full(source)

src/drawing.rs

@@ -13,10 +13,8 @@ use cairo::{
     Format,
     ImageSurface,
 };
-use gtk::{
-    Inhibit,
-    prelude::WidgetExt,
-};
+use glib::Propagation;
+use gtk::prelude::WidgetExt;
 
 #[derive(Clone)]
 struct Surface {
@@ -138,7 +136,7 @@ impl<W: Clone + WidgetExt> DrawHandler<W> {
                 eprintln!("Cannot paint: {:?}", error);
             }
 
-            Inhibit(false)
+            Propagation::Proceed
         });
     }
 }

src/lib.rs

@@ -108,19 +108,16 @@ mod widget;
 pub use fragile::Fragile;
 
 #[doc(hidden)]
-pub use glib::{
-    Cast,
-    IsA,
-    Object,
-    StaticType,
-    ToValue,
-    Value,
-};
+pub use glib::Object;
+#[doc(hidden)]
+pub use glib::Value;
+#[doc(hidden)]
+pub use glib::prelude::{Cast, IsA, StaticType, ToValue};
 #[doc(hidden)]
 pub use glib::translate::{FromGlibPtrNone, IntoGlib, ToGlibPtr};
 #[doc(hidden)]
 pub use gobject_sys::{GParameter, g_object_newv};
-use glib::Continue;
+use glib::ControlFlow;
 
 pub use crate::core::{Channel, EventStream, Sender, StreamHandle};
 pub use crate::state::{
@@ -356,7 +353,7 @@ pub fn interval<F: Fn() -> MSG + 'static, MSG: 'static>(stream: &StreamHandle<MS
     glib::timeout_add_local(std::time::Duration::from_millis(duration as u64), move || {
         let msg = constructor();
         stream.emit(msg);
-        Continue(true)
+        ControlFlow::Continue
     });
 }
 
@@ -366,6 +363,6 @@ pub fn timeout<F: Fn() -> MSG + 'static, MSG: 'static>(stream: &StreamHandle<MSG
     glib::timeout_add_local(std::time::Duration::from_millis(duration as u64), move || {
         let msg = constructor();
         stream.emit(msg);
-        Continue(false)
+        ControlFlow::Break
     });
 }

src/widget.rs

@@ -19,7 +19,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-use glib::{IsA, Object};
+use glib::Object;
+use glib::prelude::IsA;
 
 use super::{Relm, run};
 use crate::state::Update;