diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml index 233716ace982..fb24ae919b8e 100644 --- a/.github/workflows/windows-msvc.yml +++ b/.github/workflows/windows-msvc.yml @@ -33,9 +33,9 @@ jobs: id: cache with: path: c:/gnome - key: ${{ runner.os }}-gtk4-17.2 + key: ${{ runner.os }}-gtk4-18 restore-keys: | - ${{ runner.os }}-gtk4-17.2 + ${{ runner.os }}-gtk4-18 - name: Set up the PATH environment run: | @@ -110,7 +110,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml + args: --features v4_18,egl,win32 --manifest-path ./gdk4-win32/Cargo.toml - name: Clippy gdk-win32 uses: actions-rs/cargo@v1 with: diff --git a/gdk4-macos/src/auto/versions.txt b/gdk4-macos/src/auto/versions.txt index 64487059c5cd..219662173c9d 100644 --- a/gdk4-macos/src/auto/versions.txt +++ b/gdk4-macos/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-macos/sys/versions.txt b/gdk4-macos/sys/versions.txt index 64487059c5cd..219662173c9d 100644 --- a/gdk4-macos/sys/versions.txt +++ b/gdk4-macos/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-wayland/sys/Cargo.toml b/gdk4-wayland/sys/Cargo.toml index 9bc8c2ea6700..fe7827c25690 100644 --- a/gdk4-wayland/sys/Cargo.toml +++ b/gdk4-wayland/sys/Cargo.toml @@ -46,7 +46,7 @@ version = "4.12" version = "4.16" [package.metadata.system-deps.gtk4_wayland.v4_18] -version = "4.17" +version = "4.18" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-win32/Cargo.toml b/gdk4-win32/Cargo.toml index 58b2477a6511..2ec14f1cfc3e 100644 --- a/gdk4-win32/Cargo.toml +++ b/gdk4-win32/Cargo.toml @@ -20,6 +20,7 @@ version = "4" [features] v4_4 = ["gdk4-win32-sys/v4_4", "gdk/v4_4"] v4_8 = ["v4_4", "gdk4-win32-sys/v4_8", "gdk/v4_8"] +v4_18 = ["v4_8"] egl = ["khronos-egl"] win32 = ["windows"] diff --git a/gdk4-win32/Gir.toml b/gdk4-win32/Gir.toml index 7bcbaa9cd7e7..0a4c2fba610e 100644 --- a/gdk4-win32/Gir.toml +++ b/gdk4-win32/Gir.toml @@ -17,7 +17,6 @@ generate = [ "GdkWin32.Win32GLContext", "GdkWin32.Win32MessageFilterReturn", "GdkWin32.Win32Monitor", - "GdkWin32.Win32Screen", ] manual = [ @@ -111,6 +110,13 @@ status = "generate" name = "handle" manual = true +[[object]] +name = "GdkWin32.Win32Screen" +status = "generate" + [[object.property]] + name = "display" + version = "4.18" + [[object]] name = "GdkWin32.Win32Surface" status = "generate" diff --git a/gdk4-win32/README.md b/gdk4-win32/README.md index bc33aaca6383..e31443a55247 100644 --- a/gdk4-win32/README.md +++ b/gdk4-win32/README.md @@ -43,6 +43,7 @@ gdk-win32 = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4-win | Feature | Description | | --- | ----------- | +| `v4_18` | Enable the new APIs part of GTK 4.18 | | `v4_4` | Enable the new APIs part of GTK 4.4 | | `egl` | Integration with the [khronos-egl](https://crates.io/crates/khronos-egl) crate | | `win32` | Integration with the [windows](https://crates.io/crates/windows) crate | diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-win32/src/auto/win32_screen.rs b/gdk4-win32/src/auto/win32_screen.rs index f59539eb7575..cf62eace2cb4 100644 --- a/gdk4-win32/src/auto/win32_screen.rs +++ b/gdk4-win32/src/auto/win32_screen.rs @@ -3,6 +3,9 @@ // DO NOT EDIT use crate::ffi; +#[cfg(feature = "v4_18")] +#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))] +use glib::{prelude::*, translate::*}; glib::wrapper! { #[doc(alias = "GdkWin32Screen")] @@ -13,4 +16,10 @@ glib::wrapper! { } } -impl Win32Screen {} +impl Win32Screen { + #[cfg(feature = "v4_18")] + #[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))] + pub fn display(&self) -> Option { + ObjectExt::property(self, "display") + } +} diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4-x11/sys/Cargo.toml b/gdk4-x11/sys/Cargo.toml index b9708ba3f58b..f5b504c227de 100644 --- a/gdk4-x11/sys/Cargo.toml +++ b/gdk4-x11/sys/Cargo.toml @@ -43,7 +43,7 @@ version = "4.10" version = "4.16" [package.metadata.system-deps.gtk4_x11.v4_18] -version = "4.17" +version = "4.18" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4/src/auto/clipboard.rs b/gdk4/src/auto/clipboard.rs index a4a6042083ee..667756404f5b 100644 --- a/gdk4/src/auto/clipboard.rs +++ b/gdk4/src/auto/clipboard.rs @@ -294,7 +294,7 @@ impl Clipboard { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = ffi::gdk_clipboard_store_finish(_source_object as *mut _, res, &mut error); + ffi::gdk_clipboard_store_finish(_source_object as *mut _, res, &mut error); let result = if error.is_null() { Ok(()) } else { diff --git a/gdk4/src/auto/content_provider.rs b/gdk4/src/auto/content_provider.rs index ae7d6d170633..7899ba1d9e1b 100644 --- a/gdk4/src/auto/content_provider.rs +++ b/gdk4/src/auto/content_provider.rs @@ -117,7 +117,7 @@ pub trait ContentProviderExt: IsA + 'static { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = ffi::gdk_content_provider_write_mime_type_finish( + ffi::gdk_content_provider_write_mime_type_finish( _source_object as *mut _, res, &mut error, diff --git a/gdk4/src/auto/surface.rs b/gdk4/src/auto/surface.rs index 2ccf141f8337..c8f8cbf728a4 100644 --- a/gdk4/src/auto/surface.rs +++ b/gdk4/src/auto/surface.rs @@ -57,6 +57,8 @@ pub trait SurfaceExt: IsA + 'static { } } + #[cfg_attr(feature = "v4_18", deprecated = "Since 4.18")] + #[allow(deprecated)] #[doc(alias = "gdk_surface_create_cairo_context")] fn create_cairo_context(&self) -> CairoContext { unsafe { diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gdk4/sys/Cargo.toml b/gdk4/sys/Cargo.toml index 0f12ba406a9a..6939acb92d35 100644 --- a/gdk4/sys/Cargo.toml +++ b/gdk4/sys/Cargo.toml @@ -58,7 +58,7 @@ version = "4.14" version = "4.16" [package.metadata.system-deps.gtk4.v4_18] -version = "4.17" +version = "4.18" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt index 64487059c5cd..219662173c9d 100644 --- a/gdk4/sys/versions.txt +++ b/gdk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gir b/gir index 5ce24253f28c..b77ba3072803 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 5ce24253f28cb2c87fda4f7b0cf91c2e0d44484b +Subproject commit b77ba3072803f0dba6cf817da26dd6b973ae4b2f diff --git a/gir-files b/gir-files index 07aa7d177618..8245e53156fd 160000 --- a/gir-files +++ b/gir-files @@ -1 +1 @@ -Subproject commit 07aa7d1776186b7eb594c9af0b9c51b2e0745cfd +Subproject commit 8245e53156fd77fa4d0b75f3720198453039bd98 diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gsk4/sys/Cargo.toml b/gsk4/sys/Cargo.toml index 4c5b1216a965..724762c699fa 100644 --- a/gsk4/sys/Cargo.toml +++ b/gsk4/sys/Cargo.toml @@ -52,7 +52,7 @@ version = "4.14" version = "4.16" [package.metadata.system-deps.gtk4.v4_18] -version = "4.17" +version = "4.18" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt index 64487059c5cd..219662173c9d 100644 --- a/gsk4/sys/versions.txt +++ b/gsk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gtk4/Cargo.toml b/gtk4/Cargo.toml index c508e4799ccb..5ddf7c82e64b 100644 --- a/gtk4/Cargo.toml +++ b/gtk4/Cargo.toml @@ -26,6 +26,7 @@ v4_12 = ["gtk4-sys/v4_12", "v4_10", "gdk/v4_12"] v4_14 = ["gtk4-sys/v4_14", "v4_12", "gdk/v4_14", "gsk/v4_14"] v4_16 = ["gtk4-sys/v4_16", "v4_14", "gdk/v4_16", "gsk/v4_16"] v4_18 = ["gtk4-sys/v4_18", "gdk/v4_18", "v4_16"] +v4_20 = ["gtk4-sys/v4_20", "v4_18"] gio_v2_80 = ["gio/v2_80"] xml_validation = ["gtk4-macros/xml_validation"] blueprint = ["gtk4-macros/blueprint"] diff --git a/gtk4/README.md b/gtk4/README.md index 306d954c834d..a8185790a799 100644 --- a/gtk4/README.md +++ b/gtk4/README.md @@ -182,6 +182,7 @@ gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4" } | Feature | Description | | --- | ----------- | +| `v4_20` | Enable the new APIs part of GTK 4.20 | | `v4_18` | Enable the new APIs part of GTK 4.18 | | `v4_16` | Enable the new APIs part of GTK 4.16 | | `v4_14` | Enable the new APIs part of GTK 4.14 | diff --git a/gtk4/src/auto/app_chooser_button.rs b/gtk4/src/auto/app_chooser_button.rs index 7836dcc51794..c0b40c13c4f6 100644 --- a/gtk4/src/auto/app_chooser_button.rs +++ b/gtk4/src/auto/app_chooser_button.rs @@ -254,7 +254,7 @@ impl AppChooserButton { detail.map(|name| format!("custom-item-activated::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() - .map_or(&b"custom-item-activated\0"[..], |n| n.as_bytes()); + .map_or(c"custom-item-activated".to_bytes(), |n| n.as_bytes()); connect_raw( self.as_ptr() as *mut _, signal_name.as_ptr() as *const _, diff --git a/gtk4/src/auto/enums.rs b/gtk4/src/auto/enums.rs index 18ca0e26216d..286eb3047b0b 100644 --- a/gtk4/src/auto/enums.rs +++ b/gtk4/src/auto/enums.rs @@ -2619,6 +2619,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkCellRendererAccelMode")] @@ -2631,6 +2632,7 @@ pub enum CellRendererAccelMode { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for CellRendererAccelMode { type GlibType = ffi::GtkCellRendererAccelMode; @@ -2645,6 +2647,7 @@ impl IntoGlib for CellRendererAccelMode { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for CellRendererAccelMode { #[inline] @@ -2659,6 +2662,7 @@ impl FromGlib for CellRendererAccelMode { } } +#[allow(deprecated)] impl StaticType for CellRendererAccelMode { #[inline] #[doc(alias = "gtk_cell_renderer_accel_mode_get_type")] @@ -2667,6 +2671,7 @@ impl StaticType for CellRendererAccelMode { } } +#[allow(deprecated)] impl glib::HasParamSpec for CellRendererAccelMode { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -2677,10 +2682,12 @@ impl glib::HasParamSpec for CellRendererAccelMode { } } +#[allow(deprecated)] impl glib::value::ValueType for CellRendererAccelMode { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for CellRendererAccelMode { type Checker = glib::value::GenericValueTypeChecker; @@ -2691,6 +2698,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for CellRendererAccelMode { } } +#[allow(deprecated)] impl ToValue for CellRendererAccelMode { #[inline] fn to_value(&self) -> glib::Value { @@ -2707,6 +2715,7 @@ impl ToValue for CellRendererAccelMode { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: CellRendererAccelMode) -> Self { @@ -2715,6 +2724,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkCellRendererMode")] @@ -2729,6 +2739,7 @@ pub enum CellRendererMode { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for CellRendererMode { type GlibType = ffi::GtkCellRendererMode; @@ -2744,6 +2755,7 @@ impl IntoGlib for CellRendererMode { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for CellRendererMode { #[inline] @@ -2759,6 +2771,7 @@ impl FromGlib for CellRendererMode { } } +#[allow(deprecated)] impl StaticType for CellRendererMode { #[inline] #[doc(alias = "gtk_cell_renderer_mode_get_type")] @@ -2767,6 +2780,7 @@ impl StaticType for CellRendererMode { } } +#[allow(deprecated)] impl glib::HasParamSpec for CellRendererMode { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -2777,10 +2791,12 @@ impl glib::HasParamSpec for CellRendererMode { } } +#[allow(deprecated)] impl glib::value::ValueType for CellRendererMode { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for CellRendererMode { type Checker = glib::value::GenericValueTypeChecker; @@ -2791,6 +2807,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for CellRendererMode { } } +#[allow(deprecated)] impl ToValue for CellRendererMode { #[inline] fn to_value(&self) -> glib::Value { @@ -2807,6 +2824,7 @@ impl ToValue for CellRendererMode { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: CellRendererMode) -> Self { @@ -4550,6 +4568,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkFileChooserError")] @@ -4566,6 +4585,7 @@ pub enum FileChooserError { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for FileChooserError { type GlibType = ffi::GtkFileChooserError; @@ -4582,6 +4602,7 @@ impl IntoGlib for FileChooserError { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for FileChooserError { #[inline] @@ -4598,6 +4619,7 @@ impl FromGlib for FileChooserError { } } +#[allow(deprecated)] impl glib::error::ErrorDomain for FileChooserError { #[inline] fn domain() -> glib::Quark { @@ -4621,6 +4643,7 @@ impl glib::error::ErrorDomain for FileChooserError { } } +#[allow(deprecated)] impl StaticType for FileChooserError { #[inline] #[doc(alias = "gtk_file_chooser_error_get_type")] @@ -4629,6 +4652,7 @@ impl StaticType for FileChooserError { } } +#[allow(deprecated)] impl glib::HasParamSpec for FileChooserError { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -4639,10 +4663,12 @@ impl glib::HasParamSpec for FileChooserError { } } +#[allow(deprecated)] impl glib::value::ValueType for FileChooserError { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for FileChooserError { type Checker = glib::value::GenericValueTypeChecker; @@ -4653,6 +4679,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for FileChooserError { } } +#[allow(deprecated)] impl ToValue for FileChooserError { #[inline] fn to_value(&self) -> glib::Value { @@ -4669,6 +4696,7 @@ impl ToValue for FileChooserError { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: FileChooserError) -> Self { @@ -5447,6 +5475,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkIconViewDropPosition")] @@ -5467,6 +5496,7 @@ pub enum IconViewDropPosition { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for IconViewDropPosition { type GlibType = ffi::GtkIconViewDropPosition; @@ -5485,6 +5515,7 @@ impl IntoGlib for IconViewDropPosition { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for IconViewDropPosition { #[inline] @@ -5503,6 +5534,7 @@ impl FromGlib for IconViewDropPosition { } } +#[allow(deprecated)] impl StaticType for IconViewDropPosition { #[inline] #[doc(alias = "gtk_icon_view_drop_position_get_type")] @@ -5511,6 +5543,7 @@ impl StaticType for IconViewDropPosition { } } +#[allow(deprecated)] impl glib::HasParamSpec for IconViewDropPosition { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -5521,10 +5554,12 @@ impl glib::HasParamSpec for IconViewDropPosition { } } +#[allow(deprecated)] impl glib::value::ValueType for IconViewDropPosition { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for IconViewDropPosition { type Checker = glib::value::GenericValueTypeChecker; @@ -5535,6 +5570,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for IconViewDropPosition { } } +#[allow(deprecated)] impl ToValue for IconViewDropPosition { #[inline] fn to_value(&self) -> glib::Value { @@ -5551,6 +5587,7 @@ impl ToValue for IconViewDropPosition { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: IconViewDropPosition) -> Self { @@ -11631,6 +11668,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkTreeViewColumnSizing")] @@ -11645,6 +11683,7 @@ pub enum TreeViewColumnSizing { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for TreeViewColumnSizing { type GlibType = ffi::GtkTreeViewColumnSizing; @@ -11660,6 +11699,7 @@ impl IntoGlib for TreeViewColumnSizing { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for TreeViewColumnSizing { #[inline] @@ -11675,6 +11715,7 @@ impl FromGlib for TreeViewColumnSizing { } } +#[allow(deprecated)] impl StaticType for TreeViewColumnSizing { #[inline] #[doc(alias = "gtk_tree_view_column_sizing_get_type")] @@ -11683,6 +11724,7 @@ impl StaticType for TreeViewColumnSizing { } } +#[allow(deprecated)] impl glib::HasParamSpec for TreeViewColumnSizing { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -11693,10 +11735,12 @@ impl glib::HasParamSpec for TreeViewColumnSizing { } } +#[allow(deprecated)] impl glib::value::ValueType for TreeViewColumnSizing { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for TreeViewColumnSizing { type Checker = glib::value::GenericValueTypeChecker; @@ -11707,6 +11751,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for TreeViewColumnSizing { } } +#[allow(deprecated)] impl ToValue for TreeViewColumnSizing { #[inline] fn to_value(&self) -> glib::Value { @@ -11723,6 +11768,7 @@ impl ToValue for TreeViewColumnSizing { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: TreeViewColumnSizing) -> Self { @@ -11731,6 +11777,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkTreeViewDropPosition")] @@ -11747,6 +11794,7 @@ pub enum TreeViewDropPosition { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for TreeViewDropPosition { type GlibType = ffi::GtkTreeViewDropPosition; @@ -11763,6 +11811,7 @@ impl IntoGlib for TreeViewDropPosition { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for TreeViewDropPosition { #[inline] @@ -11779,6 +11828,7 @@ impl FromGlib for TreeViewDropPosition { } } +#[allow(deprecated)] impl StaticType for TreeViewDropPosition { #[inline] #[doc(alias = "gtk_tree_view_drop_position_get_type")] @@ -11787,6 +11837,7 @@ impl StaticType for TreeViewDropPosition { } } +#[allow(deprecated)] impl glib::HasParamSpec for TreeViewDropPosition { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -11797,10 +11848,12 @@ impl glib::HasParamSpec for TreeViewDropPosition { } } +#[allow(deprecated)] impl glib::value::ValueType for TreeViewDropPosition { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for TreeViewDropPosition { type Checker = glib::value::GenericValueTypeChecker; @@ -11811,6 +11864,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for TreeViewDropPosition { } } +#[allow(deprecated)] impl ToValue for TreeViewDropPosition { #[inline] fn to_value(&self) -> glib::Value { @@ -11827,6 +11881,7 @@ impl ToValue for TreeViewDropPosition { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: TreeViewDropPosition) -> Self { @@ -11835,6 +11890,7 @@ impl From for glib::Value { } } +#[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] #[doc(alias = "GtkTreeViewGridLines")] @@ -11851,6 +11907,7 @@ pub enum TreeViewGridLines { __Unknown(i32), } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for TreeViewGridLines { type GlibType = ffi::GtkTreeViewGridLines; @@ -11867,6 +11924,7 @@ impl IntoGlib for TreeViewGridLines { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for TreeViewGridLines { #[inline] @@ -11883,6 +11941,7 @@ impl FromGlib for TreeViewGridLines { } } +#[allow(deprecated)] impl StaticType for TreeViewGridLines { #[inline] #[doc(alias = "gtk_tree_view_grid_lines_get_type")] @@ -11891,6 +11950,7 @@ impl StaticType for TreeViewGridLines { } } +#[allow(deprecated)] impl glib::HasParamSpec for TreeViewGridLines { type ParamSpec = glib::ParamSpecEnum; type SetValue = Self; @@ -11901,10 +11961,12 @@ impl glib::HasParamSpec for TreeViewGridLines { } } +#[allow(deprecated)] impl glib::value::ValueType for TreeViewGridLines { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for TreeViewGridLines { type Checker = glib::value::GenericValueTypeChecker; @@ -11915,6 +11977,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for TreeViewGridLines { } } +#[allow(deprecated)] impl ToValue for TreeViewGridLines { #[inline] fn to_value(&self) -> glib::Value { @@ -11931,6 +11994,7 @@ impl ToValue for TreeViewGridLines { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: TreeViewGridLines) -> Self { diff --git a/gtk4/src/auto/file_launcher.rs b/gtk4/src/auto/file_launcher.rs index f05d99f5d4dd..1d9b4014041d 100644 --- a/gtk4/src/auto/file_launcher.rs +++ b/gtk4/src/auto/file_launcher.rs @@ -79,7 +79,7 @@ impl FileLauncher { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = ffi::gtk_file_launcher_launch_finish(_source_object as *mut _, res, &mut error); + ffi::gtk_file_launcher_launch_finish(_source_object as *mut _, res, &mut error); let result = if error.is_null() { Ok(()) } else { @@ -145,7 +145,7 @@ impl FileLauncher { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = ffi::gtk_file_launcher_open_containing_folder_finish( + ffi::gtk_file_launcher_open_containing_folder_finish( _source_object as *mut _, res, &mut error, diff --git a/gtk4/src/auto/flags.rs b/gtk4/src/auto/flags.rs index c42c033164c8..de8578da7a5b 100644 --- a/gtk4/src/auto/flags.rs +++ b/gtk4/src/auto/flags.rs @@ -180,6 +180,7 @@ impl From for glib::Value { } bitflags! { + #[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[doc(alias = "GtkCellRendererState")] pub struct CellRendererState: u32 { @@ -200,6 +201,7 @@ bitflags! { } } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for CellRendererState { type GlibType = ffi::GtkCellRendererState; @@ -210,6 +212,7 @@ impl IntoGlib for CellRendererState { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for CellRendererState { #[inline] @@ -219,6 +222,7 @@ impl FromGlib for CellRendererState { } } +#[allow(deprecated)] impl StaticType for CellRendererState { #[inline] #[doc(alias = "gtk_cell_renderer_state_get_type")] @@ -227,6 +231,7 @@ impl StaticType for CellRendererState { } } +#[allow(deprecated)] impl glib::HasParamSpec for CellRendererState { type ParamSpec = glib::ParamSpecFlags; type SetValue = Self; @@ -237,10 +242,12 @@ impl glib::HasParamSpec for CellRendererState { } } +#[allow(deprecated)] impl glib::value::ValueType for CellRendererState { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for CellRendererState { type Checker = glib::value::GenericValueTypeChecker; @@ -251,6 +258,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for CellRendererState { } } +#[allow(deprecated)] impl ToValue for CellRendererState { #[inline] fn to_value(&self) -> glib::Value { @@ -267,6 +275,7 @@ impl ToValue for CellRendererState { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: CellRendererState) -> Self { @@ -406,6 +415,7 @@ impl From for glib::Value { } bitflags! { + #[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[doc(alias = "GtkDialogFlags")] pub struct DialogFlags: u32 { @@ -418,6 +428,7 @@ bitflags! { } } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for DialogFlags { type GlibType = ffi::GtkDialogFlags; @@ -428,6 +439,7 @@ impl IntoGlib for DialogFlags { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for DialogFlags { #[inline] @@ -437,6 +449,7 @@ impl FromGlib for DialogFlags { } } +#[allow(deprecated)] impl StaticType for DialogFlags { #[inline] #[doc(alias = "gtk_dialog_flags_get_type")] @@ -445,6 +458,7 @@ impl StaticType for DialogFlags { } } +#[allow(deprecated)] impl glib::HasParamSpec for DialogFlags { type ParamSpec = glib::ParamSpecFlags; type SetValue = Self; @@ -455,10 +469,12 @@ impl glib::HasParamSpec for DialogFlags { } } +#[allow(deprecated)] impl glib::value::ValueType for DialogFlags { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for DialogFlags { type Checker = glib::value::GenericValueTypeChecker; @@ -469,6 +485,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for DialogFlags { } } +#[allow(deprecated)] impl ToValue for DialogFlags { #[inline] fn to_value(&self) -> glib::Value { @@ -485,6 +502,7 @@ impl ToValue for DialogFlags { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: DialogFlags) -> Self { @@ -588,6 +606,7 @@ impl From for glib::Value { } bitflags! { + #[cfg_attr(feature = "v4_20", deprecated = "Since 4.20")] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[doc(alias = "GtkFontChooserLevel")] pub struct FontChooserLevel: u32 { @@ -604,6 +623,7 @@ bitflags! { } } +#[allow(deprecated)] #[doc(hidden)] impl IntoGlib for FontChooserLevel { type GlibType = ffi::GtkFontChooserLevel; @@ -614,6 +634,7 @@ impl IntoGlib for FontChooserLevel { } } +#[allow(deprecated)] #[doc(hidden)] impl FromGlib for FontChooserLevel { #[inline] @@ -623,6 +644,7 @@ impl FromGlib for FontChooserLevel { } } +#[allow(deprecated)] impl StaticType for FontChooserLevel { #[inline] #[doc(alias = "gtk_font_chooser_level_get_type")] @@ -631,6 +653,7 @@ impl StaticType for FontChooserLevel { } } +#[allow(deprecated)] impl glib::HasParamSpec for FontChooserLevel { type ParamSpec = glib::ParamSpecFlags; type SetValue = Self; @@ -641,10 +664,12 @@ impl glib::HasParamSpec for FontChooserLevel { } } +#[allow(deprecated)] impl glib::value::ValueType for FontChooserLevel { type Type = Self; } +#[allow(deprecated)] unsafe impl<'a> glib::value::FromValue<'a> for FontChooserLevel { type Checker = glib::value::GenericValueTypeChecker; @@ -655,6 +680,7 @@ unsafe impl<'a> glib::value::FromValue<'a> for FontChooserLevel { } } +#[allow(deprecated)] impl ToValue for FontChooserLevel { #[inline] fn to_value(&self) -> glib::Value { @@ -671,6 +697,7 @@ impl ToValue for FontChooserLevel { } } +#[allow(deprecated)] impl From for glib::Value { #[inline] fn from(v: FontChooserLevel) -> Self { diff --git a/gtk4/src/auto/level_bar.rs b/gtk4/src/auto/level_bar.rs index 1ed55610c63e..05de62695830 100644 --- a/gtk4/src/auto/level_bar.rs +++ b/gtk4/src/auto/level_bar.rs @@ -194,7 +194,7 @@ impl LevelBar { let detailed_signal_name = detail.map(|name| format!("offset-changed::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() - .map_or(&b"offset-changed\0"[..], |n| n.as_bytes()); + .map_or(c"offset-changed".to_bytes(), |n| n.as_bytes()); connect_raw( self.as_ptr() as *mut _, signal_name.as_ptr() as *const _, diff --git a/gtk4/src/auto/mod.rs b/gtk4/src/auto/mod.rs index 07c20aa6028b..efbf7a684f4a 100644 --- a/gtk4/src/auto/mod.rs +++ b/gtk4/src/auto/mod.rs @@ -1158,7 +1158,9 @@ pub use self::enums::BaselinePosition; pub use self::enums::BorderStyle; pub use self::enums::BuilderError; pub use self::enums::ButtonsType; +#[allow(deprecated)] pub use self::enums::CellRendererAccelMode; +#[allow(deprecated)] pub use self::enums::CellRendererMode; #[cfg(feature = "v4_10")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))] @@ -1182,6 +1184,7 @@ pub use self::enums::EditableProperties; pub use self::enums::EntryIconPosition; pub use self::enums::EventSequenceState; pub use self::enums::FileChooserAction; +#[allow(deprecated)] pub use self::enums::FileChooserError; pub use self::enums::FilterChange; pub use self::enums::FilterMatch; @@ -1196,6 +1199,7 @@ pub use self::enums::FontRendering; pub use self::enums::GraphicsOffloadEnabled; pub use self::enums::IconSize; pub use self::enums::IconThemeError; +#[allow(deprecated)] pub use self::enums::IconViewDropPosition; pub use self::enums::ImageType; pub use self::enums::InputPurpose; @@ -1260,8 +1264,11 @@ pub use self::enums::TextDirection; pub use self::enums::TextExtendSelection; pub use self::enums::TextViewLayer; pub use self::enums::TextWindowType; +#[allow(deprecated)] pub use self::enums::TreeViewColumnSizing; +#[allow(deprecated)] pub use self::enums::TreeViewDropPosition; +#[allow(deprecated)] pub use self::enums::TreeViewGridLines; pub use self::enums::Unit; pub use self::enums::WrapMode; @@ -1269,10 +1276,13 @@ pub use self::enums::WrapMode; mod flags; pub use self::flags::ApplicationInhibitFlags; pub use self::flags::BuilderClosureFlags; +#[allow(deprecated)] pub use self::flags::CellRendererState; pub use self::flags::DebugFlags; +#[allow(deprecated)] pub use self::flags::DialogFlags; pub use self::flags::EventControllerScrollFlags; +#[allow(deprecated)] pub use self::flags::FontChooserLevel; pub use self::flags::IconLookupFlags; pub use self::flags::InputHints; diff --git a/gtk4/src/auto/print_dialog.rs b/gtk4/src/auto/print_dialog.rs index 554edbcaeb41..69f9a5eae07c 100644 --- a/gtk4/src/auto/print_dialog.rs +++ b/gtk4/src/auto/print_dialog.rs @@ -175,8 +175,7 @@ impl PrintDialog { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = - ffi::gtk_print_dialog_print_file_finish(_source_object as *mut _, res, &mut error); + ffi::gtk_print_dialog_print_file_finish(_source_object as *mut _, res, &mut error); let result = if error.is_null() { Ok(()) } else { diff --git a/gtk4/src/auto/uri_launcher.rs b/gtk4/src/auto/uri_launcher.rs index a481a96ca711..5219a7e7d1c3 100644 --- a/gtk4/src/auto/uri_launcher.rs +++ b/gtk4/src/auto/uri_launcher.rs @@ -65,7 +65,7 @@ impl UriLauncher { user_data: glib::ffi::gpointer, ) { let mut error = std::ptr::null_mut(); - let _ = ffi::gtk_uri_launcher_launch_finish(_source_object as *mut _, res, &mut error); + ffi::gtk_uri_launcher_launch_finish(_source_object as *mut _, res, &mut error); let result = if error.is_null() { Ok(()) } else { diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt index 64487059c5cd..219662173c9d 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 @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd) diff --git a/gtk4/src/auto/widget.rs b/gtk4/src/auto/widget.rs index 337a782898b5..2f906338ae5c 100644 --- a/gtk4/src/auto/widget.rs +++ b/gtk4/src/auto/widget.rs @@ -958,13 +958,11 @@ pub trait WidgetExt: IsA + '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)) } } diff --git a/gtk4/sys/Cargo.toml b/gtk4/sys/Cargo.toml index b45f4c8c3b25..03e242977ff9 100644 --- a/gtk4/sys/Cargo.toml +++ b/gtk4/sys/Cargo.toml @@ -59,7 +59,10 @@ version = "4.14" version = "4.16" [package.metadata.system-deps.gtk4.v4_18] -version = "4.17" +version = "4.18" + +[package.metadata.system-deps.gtk4.v4_20] +version = "4.19" [package.metadata.docs.rs] rustc-args = ["--cfg", "docsrs"] @@ -79,6 +82,7 @@ v4_12 = ["v4_10"] v4_14 = ["v4_12"] v4_16 = ["v4_14"] v4_18 = ["v4_16"] +v4_20 = ["v4_18"] [dependencies] libc = "0.2" diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt index 64487059c5cd..219662173c9d 100644 --- a/gtk4/sys/versions.txt +++ b/gtk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c) -from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618) +Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803) +from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)