Merge pull request #1264 from sdroege/0.18-backports

0.18 backports
gtk-rs · Dec 30, 2023 · 22c0f50 · 22c0f50
2 parents 5a17fef + f21c9da
commit 22c0f50
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/cairo/src/lib.rs b/cairo/src/lib.rs
@@ -228,8 +228,8 @@ pub use crate::{
     enums::*,
     error::{BorrowError, Error, IoError, Result},
     font::{
-        FontExtents, FontFace, FontOptions, FontSlant, FontType, FontWeight, Glyph, ScaledFont,
-        TextCluster, TextExtents, UserFontFace,
+        Antialias, FontExtents, FontFace, FontOptions, FontSlant, FontType, FontWeight, Glyph,
+        HintMetrics, HintStyle, ScaledFont, SubpixelOrder, TextCluster, TextExtents, UserFontFace,
     },
     image_surface::{ImageSurface, ImageSurfaceData, ImageSurfaceDataOwned},
     matrices::Matrix,

diff --git a/gdk-pixbuf/src/prelude.rs b/gdk-pixbuf/src/prelude.rs
@@ -3,9 +3,10 @@
 // rustdoc-stripper-ignore-next
 //! Traits intended for blanket imports.
 
-#[doc(hidden)]
-pub use gio::prelude::*;
 #[doc(hidden)]
 pub use glib::prelude::*;
 
+#[doc(hidden)]
+pub use gio::prelude::*;
+
 pub use crate::{auto::traits::*, pixbuf_animation::PixbufAnimationExtManual};
diff --git a/gdk-pixbuf/src/subclass/mod.rs b/gdk-pixbuf/src/subclass/mod.rs
@@ -8,9 +8,10 @@ pub mod pixbuf_animation_iter;
 pub mod pixbuf_loader;
 
 pub mod prelude {
-    pub use gio::subclass::prelude::*;
     pub use glib::subclass::prelude::*;
 
+    pub use gio::subclass::prelude::*;
+
     pub use super::{
         pixbuf_animation::{PixbufAnimationImpl, PixbufAnimationImplExt},
         pixbuf_animation_iter::{PixbufAnimationIterImpl, PixbufAnimationIterImplExt},

diff --git a/glib-macros/src/boxed_derive.rs b/glib-macros/src/boxed_derive.rs
@@ -197,6 +197,10 @@ pub fn impl_boxed(input: &syn::DeriveInput) -> TokenStream {
 
         #impl_from_value
 
+        impl #crate_ident::translate::GlibPtrDefault for #name {
+            type GlibType = *mut #name;
+        }
+
         impl #crate_ident::translate::FromGlibPtrBorrow<*const #name> for #name {
             #[inline]
             unsafe fn from_glib_borrow(ptr: *const #name) -> #crate_ident::translate::Borrowed<Self> {

diff --git a/glib-macros/src/shared_boxed_derive.rs b/glib-macros/src/shared_boxed_derive.rs
@@ -218,6 +218,10 @@ pub fn impl_shared_boxed(input: &syn::DeriveInput) -> proc_macro2::TokenStream {
 
         #impl_from_value
 
+        impl #crate_ident::translate::GlibPtrDefault for #name {
+            type GlibType = *mut #refcounted_type_prefix::InnerType;
+        }
+
         impl #crate_ident::translate::FromGlibPtrBorrow<*const #refcounted_type_prefix::InnerType> for #name {
             #[inline]
             unsafe fn from_glib_borrow(ptr: *const #refcounted_type_prefix::InnerType) -> #crate_ident::translate::Borrowed<Self> {