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

Commit e07b204

Browse files
authored
Merge pull request #730 from sdroege/0.15-backports
0.15 backports
2 parents 176a97a + b706015 commit e07b204

13 files changed

+309
-10
lines changed

gdkwayland/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rust-version = "1.56"
1616
v3_20 = ["ffi/v3_20", "gdk/v3_20"]
1717
v3_22 = ["v3_20", "ffi/v3_22", "gdk/v3_22"]
1818
v3_24 = ["v3_22", "ffi/v3_24", "gdk/v3_24"]
19+
v3_24_22 = ["v3_24", "ffi/v3_24_22"]
1920
dox = ["ffi/dox"]
2021

2122
[package.metadata.docs.rs]

gdkwayland/src/wayland_window.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ impl WaylandWindow {
101101
}
102102
}
103103

104-
#[cfg(any(feature = "v3_24", feature = "dox"))]
105-
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24")))]
104+
#[cfg(any(feature = "v3_24_22", feature = "dox"))]
105+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24_22")))]
106106
#[doc(alias = "gdk_wayland_window_set_application_id")]
107107
pub fn set_application_id(&self, application_id: &str) -> bool {
108108
unsafe {

gdkwayland/sys/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ name = "gdk_wayland_sys"
1717
v3_20 = ["gdk/v3_20"]
1818
v3_22 = ["v3_20", "gdk/v3_22"]
1919
v3_24 = ["v3_22", "gdk/v3_24"]
20+
v3_24_22 = ["v3_24"]
2021
dox = ["gdk/dox"]
2122

2223
[dependencies]

gdkwayland/sys/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ extern "C" {
8181
parent_handle: *const c_char,
8282
) -> glib::gboolean;
8383

84-
#[cfg(any(feature = "v3_24", feature = "dox"))]
85-
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24")))]
84+
#[cfg(any(feature = "v3_24_22", feature = "dox"))]
85+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24_22")))]
8686
pub fn gdk_wayland_window_set_application_id(
8787
window: *mut GdkWaylandWindow,
8888
application_id: *const c_char,

gtk/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ v3_24 = ["v3_22_30", "ffi/v3_24"]
3232
v3_24_1 = ["v3_24", "ffi/v3_24_1"]
3333
v3_24_8 = ["v3_24_1", "ffi/v3_24_8"]
3434
v3_24_9 = ["v3_24_8", "ffi/v3_24_9"]
35+
v3_24_11 = ["v3_24_9", "ffi/v3_24_11"]
36+
v3_24_30 = ["v3_24_11", "ffi/v3_24_30"]
3537
dox = ["gdk/dox", "ffi/dox"]
3638
gio_v2_58 = ["gio/v2_58"]
3739

gtk/Gir.toml

+14-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ generate = [
4747
"Gtk.FileChooserAction",
4848
"Gtk.FileChooserConfirmation",
4949
"Gtk.FileChooserError",
50-
"Gtk.FileChooserWidgetAccessible",
5150
"Gtk.FileFilter",
5251
"Gtk.FileFilterFlags",
5352
"Gtk.GestureSingle",
@@ -170,6 +169,7 @@ ignore = [
170169

171170
manual = [
172171
"Atk.Object",
172+
"Atk.Role",
173173
"cairo.Context",
174174
"cairo.FontOptions",
175175
"cairo.RectangleInt",
@@ -1044,6 +1044,11 @@ name = "Gtk.FileChooserWidget"
10441044
status = "generate"
10451045
generate_builder = true
10461046

1047+
[[object]]
1048+
name = "Gtk.FileChooserWidgetAccessible"
1049+
status = "generate"
1050+
version = "3.24.30"
1051+
10471052
[[object]]
10481053
name = "Gtk.Fixed"
10491054
status = "generate"
@@ -1230,6 +1235,12 @@ generate_builder = true
12301235
name = "position"
12311236
type = "gint"
12321237

1238+
[[object]]
1239+
name = "Gtk.HeaderBarAccessible"
1240+
status = "generate"
1241+
generate_builder = true
1242+
version = "3.24.11"
1243+
12331244
[[object]]
12341245
name = "Gtk.IconTheme"
12351246
status = "generate"
@@ -1757,6 +1768,7 @@ name = "Gtk.PlugAccessible"
17571768
status = "generate"
17581769
generate_builder = true
17591770
cfg_condition = "gdk_backend = \"x11\""
1771+
version = "3.24.30"
17601772

17611773
[[object]]
17621774
name = "Gtk.Popover"
@@ -2106,6 +2118,7 @@ name = "Gtk.SocketAccessible"
21062118
status = "generate"
21072119
generate_builder = true
21082120
cfg_condition = "gdk_backend = \"x11\""
2121+
version = "3.24.30"
21092122

21102123
[[object]]
21112124
name = "Gtk.SpinButton"

gtk/src/auto/header_bar_accessible.rs

+204
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
// This file was generated by gir (https://github.com/gtk-rs/gir)
2+
// from gir-files (https://github.com/gtk-rs/gir-files)
3+
// DO NOT EDIT
4+
5+
use glib::object::Cast;
6+
use glib::object::IsA;
7+
use glib::StaticType;
8+
use glib::ToValue;
9+
use std::fmt;
10+
11+
glib::wrapper! {
12+
#[doc(alias = "GtkHeaderBarAccessible")]
13+
pub struct HeaderBarAccessible(Object<ffi::GtkHeaderBarAccessible, ffi::GtkHeaderBarAccessibleClass>) @extends atk::Object;
14+
15+
match fn {
16+
type_ => || ffi::gtk_header_bar_accessible_get_type(),
17+
}
18+
}
19+
20+
impl HeaderBarAccessible {
21+
pub const NONE: Option<&'static HeaderBarAccessible> = None;
22+
23+
// rustdoc-stripper-ignore-next
24+
/// Creates a new builder-pattern struct instance to construct [`HeaderBarAccessible`] objects.
25+
///
26+
/// This method returns an instance of [`HeaderBarAccessibleBuilder`](crate::builders::HeaderBarAccessibleBuilder) which can be used to create [`HeaderBarAccessible`] objects.
27+
pub fn builder() -> HeaderBarAccessibleBuilder {
28+
HeaderBarAccessibleBuilder::default()
29+
}
30+
}
31+
32+
#[derive(Clone, Default)]
33+
// rustdoc-stripper-ignore-next
34+
/// A [builder-pattern] type to construct [`HeaderBarAccessible`] objects.
35+
///
36+
/// [builder-pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
37+
#[must_use = "The builder must be built to be used"]
38+
pub struct HeaderBarAccessibleBuilder {
39+
accessible_description: Option<String>,
40+
accessible_name: Option<String>,
41+
accessible_parent: Option<atk::Object>,
42+
accessible_role: Option<atk::Role>,
43+
accessible_table_caption: Option<String>,
44+
accessible_table_caption_object: Option<atk::Object>,
45+
accessible_table_column_description: Option<String>,
46+
accessible_table_column_header: Option<atk::Object>,
47+
accessible_table_row_description: Option<String>,
48+
accessible_table_row_header: Option<atk::Object>,
49+
accessible_table_summary: Option<atk::Object>,
50+
accessible_value: Option<f64>,
51+
}
52+
53+
impl HeaderBarAccessibleBuilder {
54+
// rustdoc-stripper-ignore-next
55+
/// Create a new [`HeaderBarAccessibleBuilder`].
56+
pub fn new() -> Self {
57+
Self::default()
58+
}
59+
60+
// rustdoc-stripper-ignore-next
61+
/// Build the [`HeaderBarAccessible`].
62+
#[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
63+
pub fn build(self) -> HeaderBarAccessible {
64+
let mut properties: Vec<(&str, &dyn ToValue)> = vec![];
65+
if let Some(ref accessible_description) = self.accessible_description {
66+
properties.push(("accessible-description", accessible_description));
67+
}
68+
if let Some(ref accessible_name) = self.accessible_name {
69+
properties.push(("accessible-name", accessible_name));
70+
}
71+
if let Some(ref accessible_parent) = self.accessible_parent {
72+
properties.push(("accessible-parent", accessible_parent));
73+
}
74+
if let Some(ref accessible_role) = self.accessible_role {
75+
properties.push(("accessible-role", accessible_role));
76+
}
77+
if let Some(ref accessible_table_caption) = self.accessible_table_caption {
78+
properties.push(("accessible-table-caption", accessible_table_caption));
79+
}
80+
if let Some(ref accessible_table_caption_object) = self.accessible_table_caption_object {
81+
properties.push((
82+
"accessible-table-caption-object",
83+
accessible_table_caption_object,
84+
));
85+
}
86+
if let Some(ref accessible_table_column_description) =
87+
self.accessible_table_column_description
88+
{
89+
properties.push((
90+
"accessible-table-column-description",
91+
accessible_table_column_description,
92+
));
93+
}
94+
if let Some(ref accessible_table_column_header) = self.accessible_table_column_header {
95+
properties.push((
96+
"accessible-table-column-header",
97+
accessible_table_column_header,
98+
));
99+
}
100+
if let Some(ref accessible_table_row_description) = self.accessible_table_row_description {
101+
properties.push((
102+
"accessible-table-row-description",
103+
accessible_table_row_description,
104+
));
105+
}
106+
if let Some(ref accessible_table_row_header) = self.accessible_table_row_header {
107+
properties.push(("accessible-table-row-header", accessible_table_row_header));
108+
}
109+
if let Some(ref accessible_table_summary) = self.accessible_table_summary {
110+
properties.push(("accessible-table-summary", accessible_table_summary));
111+
}
112+
if let Some(ref accessible_value) = self.accessible_value {
113+
properties.push(("accessible-value", accessible_value));
114+
}
115+
glib::Object::new::<HeaderBarAccessible>(&properties)
116+
.expect("Failed to create an instance of HeaderBarAccessible")
117+
}
118+
119+
pub fn accessible_description(mut self, accessible_description: &str) -> Self {
120+
self.accessible_description = Some(accessible_description.to_string());
121+
self
122+
}
123+
124+
pub fn accessible_name(mut self, accessible_name: &str) -> Self {
125+
self.accessible_name = Some(accessible_name.to_string());
126+
self
127+
}
128+
129+
pub fn accessible_parent(mut self, accessible_parent: &impl IsA<atk::Object>) -> Self {
130+
self.accessible_parent = Some(accessible_parent.clone().upcast());
131+
self
132+
}
133+
134+
pub fn accessible_role(mut self, accessible_role: atk::Role) -> Self {
135+
self.accessible_role = Some(accessible_role);
136+
self
137+
}
138+
139+
pub fn accessible_table_caption(mut self, accessible_table_caption: &str) -> Self {
140+
self.accessible_table_caption = Some(accessible_table_caption.to_string());
141+
self
142+
}
143+
144+
pub fn accessible_table_caption_object(
145+
mut self,
146+
accessible_table_caption_object: &impl IsA<atk::Object>,
147+
) -> Self {
148+
self.accessible_table_caption_object =
149+
Some(accessible_table_caption_object.clone().upcast());
150+
self
151+
}
152+
153+
pub fn accessible_table_column_description(
154+
mut self,
155+
accessible_table_column_description: &str,
156+
) -> Self {
157+
self.accessible_table_column_description =
158+
Some(accessible_table_column_description.to_string());
159+
self
160+
}
161+
162+
pub fn accessible_table_column_header(
163+
mut self,
164+
accessible_table_column_header: &impl IsA<atk::Object>,
165+
) -> Self {
166+
self.accessible_table_column_header = Some(accessible_table_column_header.clone().upcast());
167+
self
168+
}
169+
170+
pub fn accessible_table_row_description(
171+
mut self,
172+
accessible_table_row_description: &str,
173+
) -> Self {
174+
self.accessible_table_row_description = Some(accessible_table_row_description.to_string());
175+
self
176+
}
177+
178+
pub fn accessible_table_row_header(
179+
mut self,
180+
accessible_table_row_header: &impl IsA<atk::Object>,
181+
) -> Self {
182+
self.accessible_table_row_header = Some(accessible_table_row_header.clone().upcast());
183+
self
184+
}
185+
186+
pub fn accessible_table_summary(
187+
mut self,
188+
accessible_table_summary: &impl IsA<atk::Object>,
189+
) -> Self {
190+
self.accessible_table_summary = Some(accessible_table_summary.clone().upcast());
191+
self
192+
}
193+
194+
pub fn accessible_value(mut self, accessible_value: f64) -> Self {
195+
self.accessible_value = Some(accessible_value);
196+
self
197+
}
198+
}
199+
200+
impl fmt::Display for HeaderBarAccessible {
201+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
202+
f.write_str("HeaderBarAccessible")
203+
}
204+
}

0 commit comments

Comments
 (0)