Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit 9beee11

Browse files
sdroegesdroege
authored
Merge pull request #702 from sdroege/update-gir-files
Update gir files
2 parents 433d40f + 5c7dadf commit 9beee11

24 files changed

+516
-935
lines changed

‎atk/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎atk/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎gdk/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎gdk/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎gdkx11/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎gdkx11/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ 79e747a1a188)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ b4887eac499d)
1+
Generated by gir (https://github.com/gtk-rs/gir @ ee37253c10af)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 5264fd0c3183)

‎gir

‎gir-files

‎gtk/src/auto/action_bar.rs

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -457,55 +457,37 @@ impl<O: IsA<ActionBar>> ActionBarExt for O {
457457
}
458458

459459
fn child_pack_type<T: IsA<crate::Widget>>(&self, item: &T) -> PackType {
460-
unsafe {
461-
let mut value = glib::Value::from_type(<PackType as StaticType>::static_type());
462-
crate::ffi::gtk_container_child_get_property(
463-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
464-
item.to_glib_none().0 as *mut _,
465-
b"pack-type\0".as_ptr() as *const _,
466-
value.to_glib_none_mut().0,
467-
);
468-
value
469-
.get()
470-
.expect("Return Value for property `pack-type` getter")
471-
}
460+
crate::prelude::ContainerExtManual::child_property(
461+
self.as_ref(),
462+
&item.clone().upcast(),
463+
"pack-type",
464+
)
472465
}
473466

474467
fn set_child_pack_type<T: IsA<crate::Widget>>(&self, item: &T, pack_type: PackType) {
475-
unsafe {
476-
crate::ffi::gtk_container_child_set_property(
477-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
478-
item.to_glib_none().0 as *mut _,
479-
b"pack-type\0".as_ptr() as *const _,
480-
pack_type.to_value().to_glib_none().0,
481-
);
482-
}
468+
crate::prelude::ContainerExtManual::child_set_property(
469+
self.as_ref(),
470+
&item.clone().upcast(),
471+
"pack-type",
472+
&pack_type,
473+
)
483474
}
484475

485476
fn child_position<T: IsA<crate::Widget>>(&self, item: &T) -> i32 {
486-
unsafe {
487-
let mut value = glib::Value::from_type(<i32 as StaticType>::static_type());
488-
crate::ffi::gtk_container_child_get_property(
489-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
490-
item.to_glib_none().0 as *mut _,
491-
b"position\0".as_ptr() as *const _,
492-
value.to_glib_none_mut().0,
493-
);
494-
value
495-
.get()
496-
.expect("Return Value for property `position` getter")
497-
}
477+
crate::prelude::ContainerExtManual::child_property(
478+
self.as_ref(),
479+
&item.clone().upcast(),
480+
"position",
481+
)
498482
}
499483

500484
fn set_child_position<T: IsA<crate::Widget>>(&self, item: &T, position: i32) {
501-
unsafe {
502-
crate::ffi::gtk_container_child_set_property(
503-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
504-
item.to_glib_none().0 as *mut _,
505-
b"position\0".as_ptr() as *const _,
506-
position.to_value().to_glib_none().0,
507-
);
508-
}
485+
crate::prelude::ContainerExtManual::child_set_property(
486+
self.as_ref(),
487+
&item.clone().upcast(),
488+
"position",
489+
&position,
490+
)
509491
}
510492
}
511493

‎gtk/src/auto/assistant.rs

Lines changed: 44 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -999,108 +999,71 @@ impl<O: IsA<Assistant>> AssistantExt for O {
999999
}
10001000

10011001
fn child_is_complete<T: IsA<crate::Widget>>(&self, item: &T) -> bool {
1002-
unsafe {
1003-
let mut value = glib::Value::from_type(<bool as StaticType>::static_type());
1004-
crate::ffi::gtk_container_child_get_property(
1005-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1006-
item.to_glib_none().0 as *mut _,
1007-
b"complete\0".as_ptr() as *const _,
1008-
value.to_glib_none_mut().0,
1009-
);
1010-
value
1011-
.get()
1012-
.expect("Return Value for property `complete` getter")
1013-
}
1002+
crate::prelude::ContainerExtManual::child_property(
1003+
self.as_ref(),
1004+
&item.clone().upcast(),
1005+
"complete",
1006+
)
10141007
}
10151008

10161009
fn set_child_complete<T: IsA<crate::Widget>>(&self, item: &T, complete: bool) {
1017-
unsafe {
1018-
crate::ffi::gtk_container_child_set_property(
1019-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1020-
item.to_glib_none().0 as *mut _,
1021-
b"complete\0".as_ptr() as *const _,
1022-
complete.to_value().to_glib_none().0,
1023-
);
1024-
}
1010+
crate::prelude::ContainerExtManual::child_set_property(
1011+
self.as_ref(),
1012+
&item.clone().upcast(),
1013+
"complete",
1014+
&complete,
1015+
)
10251016
}
10261017

10271018
fn child_has_padding<T: IsA<crate::Widget>>(&self, item: &T) -> bool {
1028-
unsafe {
1029-
let mut value = glib::Value::from_type(<bool as StaticType>::static_type());
1030-
crate::ffi::gtk_container_child_get_property(
1031-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1032-
item.to_glib_none().0 as *mut _,
1033-
b"has-padding\0".as_ptr() as *const _,
1034-
value.to_glib_none_mut().0,
1035-
);
1036-
value
1037-
.get()
1038-
.expect("Return Value for property `has-padding` getter")
1039-
}
1019+
crate::prelude::ContainerExtManual::child_property(
1020+
self.as_ref(),
1021+
&item.clone().upcast(),
1022+
"has-padding",
1023+
)
10401024
}
10411025

10421026
fn set_child_has_padding<T: IsA<crate::Widget>>(&self, item: &T, has_padding: bool) {
1043-
unsafe {
1044-
crate::ffi::gtk_container_child_set_property(
1045-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1046-
item.to_glib_none().0 as *mut _,
1047-
b"has-padding\0".as_ptr() as *const _,
1048-
has_padding.to_value().to_glib_none().0,
1049-
);
1050-
}
1027+
crate::prelude::ContainerExtManual::child_set_property(
1028+
self.as_ref(),
1029+
&item.clone().upcast(),
1030+
"has-padding",
1031+
&has_padding,
1032+
)
10511033
}
10521034

10531035
fn child_page_type<T: IsA<crate::Widget>>(&self, item: &T) -> AssistantPageType {
1054-
unsafe {
1055-
let mut value =
1056-
glib::Value::from_type(<AssistantPageType as StaticType>::static_type());
1057-
crate::ffi::gtk_container_child_get_property(
1058-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1059-
item.to_glib_none().0 as *mut _,
1060-
b"page-type\0".as_ptr() as *const _,
1061-
value.to_glib_none_mut().0,
1062-
);
1063-
value
1064-
.get()
1065-
.expect("Return Value for property `page-type` getter")
1066-
}
1036+
crate::prelude::ContainerExtManual::child_property(
1037+
self.as_ref(),
1038+
&item.clone().upcast(),
1039+
"page-type",
1040+
)
10671041
}
10681042

10691043
fn set_child_page_type<T: IsA<crate::Widget>>(&self, item: &T, page_type: AssistantPageType) {
1070-
unsafe {
1071-
crate::ffi::gtk_container_child_set_property(
1072-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1073-
item.to_glib_none().0 as *mut _,
1074-
b"page-type\0".as_ptr() as *const _,
1075-
page_type.to_value().to_glib_none().0,
1076-
);
1077-
}
1044+
crate::prelude::ContainerExtManual::child_set_property(
1045+
self.as_ref(),
1046+
&item.clone().upcast(),
1047+
"page-type",
1048+
&page_type,
1049+
)
10781050
}
10791051

10801052
fn child_title<T: IsA<crate::Widget>>(&self, item: &T) -> Option<glib::GString> {
1081-
unsafe {
1082-
let mut value = glib::Value::from_type(<glib::GString as StaticType>::static_type());
1083-
crate::ffi::gtk_container_child_get_property(
1084-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1085-
item.to_glib_none().0 as *mut _,
1086-
b"title\0".as_ptr() as *const _,
1087-
value.to_glib_none_mut().0,
1088-
);
1089-
value
1090-
.get()
1091-
.expect("Return Value for property `title` getter")
1092-
}
1053+
crate::prelude::ContainerExtManual::child_property(
1054+
self.as_ref(),
1055+
&item.clone().upcast(),
1056+
"title",
1057+
)
10931058
}
10941059

10951060
fn set_child_title<T: IsA<crate::Widget>>(&self, item: &T, title: Option<&str>) {
1096-
unsafe {
1097-
crate::ffi::gtk_container_child_set_property(
1098-
self.to_glib_none().0 as *mut crate::ffi::GtkContainer,
1099-
item.to_glib_none().0 as *mut _,
1100-
b"title\0".as_ptr() as *const _,
1101-
title.to_value().to_glib_none().0,
1102-
);
1103-
}
1061+
crate::prelude::ContainerExtManual::child_set_property(
1062+
self.as_ref(),
1063+
&item.clone().upcast(),
1064+
"title",
1065+
&title,
1066+
)
11041067
}
11051068

11061069
fn connect_apply<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {

0 commit comments

Comments
 (0)