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

Commit abd6cc7

Browse files
authored
Merge pull request #778 from GuillaumeGomez/regen
Regenerate with latest gir
2 parents ca797cc + b0722d6 commit abd6cc7

File tree

16 files changed

+64
-20
lines changed

16 files changed

+64
-20
lines changed

atk/src/auto/enums.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,8 @@ pub enum Role {
669669
Mark,
670670
#[doc(alias = "ATK_ROLE_SUGGESTION")]
671671
Suggestion,
672+
#[doc(alias = "ATK_ROLE_PUSH_BUTTON_MENU")]
673+
PushButtonMenu,
672674
#[doc(alias = "ATK_ROLE_LAST_DEFINED")]
673675
LastDefined,
674676
#[doc(hidden)]
@@ -830,6 +832,7 @@ impl fmt::Display for Role {
830832
Self::ContentInsertion => "ContentInsertion",
831833
Self::Mark => "Mark",
832834
Self::Suggestion => "Suggestion",
835+
Self::PushButtonMenu => "PushButtonMenu",
833836
Self::LastDefined => "LastDefined",
834837
_ => "Unknown",
835838
}
@@ -970,6 +973,7 @@ impl IntoGlib for Role {
970973
Self::ContentInsertion => ffi::ATK_ROLE_CONTENT_INSERTION,
971974
Self::Mark => ffi::ATK_ROLE_MARK,
972975
Self::Suggestion => ffi::ATK_ROLE_SUGGESTION,
976+
Self::PushButtonMenu => ffi::ATK_ROLE_PUSH_BUTTON_MENU,
973977
Self::LastDefined => ffi::ATK_ROLE_LAST_DEFINED,
974978
Self::__Unknown(value) => value,
975979
}
@@ -1108,6 +1112,7 @@ impl FromGlib<ffi::AtkRole> for Role {
11081112
ffi::ATK_ROLE_CONTENT_INSERTION => Self::ContentInsertion,
11091113
ffi::ATK_ROLE_MARK => Self::Mark,
11101114
ffi::ATK_ROLE_SUGGESTION => Self::Suggestion,
1115+
ffi::ATK_ROLE_PUSH_BUTTON_MENU => Self::PushButtonMenu,
11111116
ffi::ATK_ROLE_LAST_DEFINED => Self::LastDefined,
11121117
value => Self::__Unknown(value),
11131118
}

atk/src/auto/object.rs

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ pub trait AtkObjectExt: 'static {
219219
f: F,
220220
) -> SignalHandlerId;
221221

222+
#[cfg(any(feature = "v2_46", feature = "dox"))]
223+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_46")))]
224+
#[doc(alias = "announcement")]
225+
fn connect_announcement<F: Fn(&Self, &str) + 'static>(&self, f: F) -> SignalHandlerId;
226+
222227
#[doc(alias = "children-changed")]
223228
fn connect_children_changed<F: Fn(&Self, u32, &Object) + 'static>(
224229
&self,
@@ -666,6 +671,33 @@ impl<O: IsA<Object>> AtkObjectExt for O {
666671
}
667672
}
668673

674+
#[cfg(any(feature = "v2_46", feature = "dox"))]
675+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_46")))]
676+
fn connect_announcement<F: Fn(&Self, &str) + 'static>(&self, f: F) -> SignalHandlerId {
677+
unsafe extern "C" fn announcement_trampoline<P: IsA<Object>, F: Fn(&P, &str) + 'static>(
678+
this: *mut ffi::AtkObject,
679+
arg1: *mut libc::c_char,
680+
f: glib::ffi::gpointer,
681+
) {
682+
let f: &F = &*(f as *const F);
683+
f(
684+
Object::from_glib_borrow(this).unsafe_cast_ref(),
685+
&glib::GString::from_glib_borrow(arg1),
686+
)
687+
}
688+
unsafe {
689+
let f: Box_<F> = Box_::new(f);
690+
connect_raw(
691+
self.as_ptr() as *mut _,
692+
b"announcement\0".as_ptr() as *const _,
693+
Some(transmute::<_, unsafe extern "C" fn()>(
694+
announcement_trampoline::<Self, F> as *const (),
695+
)),
696+
Box_::into_raw(f),
697+
)
698+
}
699+
}
700+
669701
fn connect_children_changed<F: Fn(&Self, u32, &Object) + 'static>(
670702
&self,
671703
detail: Option<&str>,

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 @ b5068ede6c51)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 7ebd4478b4a5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)

atk/sys/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ v2_30 = []
2222
v2_32 = ["v2_30"]
2323
v2_34 = ["v2_32"]
2424
v2_38 = ["v2_34"]
25+
v2_46 = ["v2_38"]
2526

2627
[lib]
2728
name = "atk_sys"
@@ -56,3 +57,6 @@ version = "2.34"
5657

5758
[package.metadata.system-deps.atk.v2_38]
5859
version = "2.38"
60+
61+
[package.metadata.system-deps.atk.v2_46]
62+
version = "2.46"

atk/sys/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ pub const ATK_ROLE_CONTENT_DELETION: AtkRole = 123;
197197
pub const ATK_ROLE_CONTENT_INSERTION: AtkRole = 124;
198198
pub const ATK_ROLE_MARK: AtkRole = 125;
199199
pub const ATK_ROLE_SUGGESTION: AtkRole = 126;
200-
pub const ATK_ROLE_LAST_DEFINED: AtkRole = 127;
200+
pub const ATK_ROLE_PUSH_BUTTON_MENU: AtkRole = 127;
201+
pub const ATK_ROLE_LAST_DEFINED: AtkRole = 128;
201202

202203
pub type AtkScrollType = c_int;
203204
pub const ATK_SCROLL_TOP_LEFT: AtkScrollType = 0;

atk/sys/tests/abi.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
741741
("(gint) ATK_ROLE_INVALID", "0"),
742742
("(gint) ATK_ROLE_LABEL", "28"),
743743
("(gint) ATK_ROLE_LANDMARK", "108"),
744-
("(gint) ATK_ROLE_LAST_DEFINED", "127"),
744+
("(gint) ATK_ROLE_LAST_DEFINED", "128"),
745745
("(gint) ATK_ROLE_LAYERED_PANE", "29"),
746746
("(gint) ATK_ROLE_LEVEL_BAR", "101"),
747747
("(gint) ATK_ROLE_LINK", "86"),
@@ -768,6 +768,7 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
768768
("(gint) ATK_ROLE_POPUP_MENU", "40"),
769769
("(gint) ATK_ROLE_PROGRESS_BAR", "41"),
770770
("(gint) ATK_ROLE_PUSH_BUTTON", "42"),
771+
("(gint) ATK_ROLE_PUSH_BUTTON_MENU", "127"),
771772
("(gint) ATK_ROLE_RADIO_BUTTON", "43"),
772773
("(gint) ATK_ROLE_RADIO_MENU_ITEM", "44"),
773774
("(gint) ATK_ROLE_RATING", "112"),

atk/sys/tests/constant.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ int main() {
151151
PRINT_CONSTANT((gint) ATK_ROLE_POPUP_MENU);
152152
PRINT_CONSTANT((gint) ATK_ROLE_PROGRESS_BAR);
153153
PRINT_CONSTANT((gint) ATK_ROLE_PUSH_BUTTON);
154+
PRINT_CONSTANT((gint) ATK_ROLE_PUSH_BUTTON_MENU);
154155
PRINT_CONSTANT((gint) ATK_ROLE_RADIO_BUTTON);
155156
PRINT_CONSTANT((gint) ATK_ROLE_RADIO_MENU_ITEM);
156157
PRINT_CONSTANT((gint) ATK_ROLE_RATING);

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 @ b5068ede6c51)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 7ebd4478b4a5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)

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 @ b5068ede6c51)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 7ebd4478b4a5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)

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 @ b5068ede6c51)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 7ebd4478b4a5)
1+
Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)

0 commit comments

Comments
 (0)