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

Commit

Permalink
Merge pull request #730 from sdroege/0.15-backports
Browse files Browse the repository at this point in the history
0.15 backports
  • Loading branch information
sdroege committed Jan 31, 2022
2 parents 176a97a + b706015 commit e07b204
Show file tree
Hide file tree
Showing 13 changed files with 309 additions and 10 deletions.
1 change: 1 addition & 0 deletions gdkwayland/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ rust-version = "1.56"
v3_20 = ["ffi/v3_20", "gdk/v3_20"]
v3_22 = ["v3_20", "ffi/v3_22", "gdk/v3_22"]
v3_24 = ["v3_22", "ffi/v3_24", "gdk/v3_24"]
v3_24_22 = ["v3_24", "ffi/v3_24_22"]
dox = ["ffi/dox"]

[package.metadata.docs.rs]
Expand Down
4 changes: 2 additions & 2 deletions gdkwayland/src/wayland_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ impl WaylandWindow {
}
}

#[cfg(any(feature = "v3_24", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24")))]
#[cfg(any(feature = "v3_24_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24_22")))]
#[doc(alias = "gdk_wayland_window_set_application_id")]
pub fn set_application_id(&self, application_id: &str) -> bool {
unsafe {
Expand Down
1 change: 1 addition & 0 deletions gdkwayland/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ name = "gdk_wayland_sys"
v3_20 = ["gdk/v3_20"]
v3_22 = ["v3_20", "gdk/v3_22"]
v3_24 = ["v3_22", "gdk/v3_24"]
v3_24_22 = ["v3_24"]
dox = ["gdk/dox"]

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions gdkwayland/sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ extern "C" {
parent_handle: *const c_char,
) -> glib::gboolean;

#[cfg(any(feature = "v3_24", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24")))]
#[cfg(any(feature = "v3_24_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v3_24_22")))]
pub fn gdk_wayland_window_set_application_id(
window: *mut GdkWaylandWindow,
application_id: *const c_char,
Expand Down
2 changes: 2 additions & 0 deletions gtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ v3_24 = ["v3_22_30", "ffi/v3_24"]
v3_24_1 = ["v3_24", "ffi/v3_24_1"]
v3_24_8 = ["v3_24_1", "ffi/v3_24_8"]
v3_24_9 = ["v3_24_8", "ffi/v3_24_9"]
v3_24_11 = ["v3_24_9", "ffi/v3_24_11"]
v3_24_30 = ["v3_24_11", "ffi/v3_24_30"]
dox = ["gdk/dox", "ffi/dox"]
gio_v2_58 = ["gio/v2_58"]

Expand Down
15 changes: 14 additions & 1 deletion gtk/Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ generate = [
"Gtk.FileChooserAction",
"Gtk.FileChooserConfirmation",
"Gtk.FileChooserError",
"Gtk.FileChooserWidgetAccessible",
"Gtk.FileFilter",
"Gtk.FileFilterFlags",
"Gtk.GestureSingle",
Expand Down Expand Up @@ -170,6 +169,7 @@ ignore = [

manual = [
"Atk.Object",
"Atk.Role",
"cairo.Context",
"cairo.FontOptions",
"cairo.RectangleInt",
Expand Down Expand Up @@ -1044,6 +1044,11 @@ name = "Gtk.FileChooserWidget"
status = "generate"
generate_builder = true

[[object]]
name = "Gtk.FileChooserWidgetAccessible"
status = "generate"
version = "3.24.30"

[[object]]
name = "Gtk.Fixed"
status = "generate"
Expand Down Expand Up @@ -1230,6 +1235,12 @@ generate_builder = true
name = "position"
type = "gint"

[[object]]
name = "Gtk.HeaderBarAccessible"
status = "generate"
generate_builder = true
version = "3.24.11"

[[object]]
name = "Gtk.IconTheme"
status = "generate"
Expand Down Expand Up @@ -1757,6 +1768,7 @@ name = "Gtk.PlugAccessible"
status = "generate"
generate_builder = true
cfg_condition = "gdk_backend = \"x11\""
version = "3.24.30"

[[object]]
name = "Gtk.Popover"
Expand Down Expand Up @@ -2106,6 +2118,7 @@ name = "Gtk.SocketAccessible"
status = "generate"
generate_builder = true
cfg_condition = "gdk_backend = \"x11\""
version = "3.24.30"

[[object]]
name = "Gtk.SpinButton"
Expand Down
204 changes: 204 additions & 0 deletions gtk/src/auto/header_bar_accessible.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use glib::object::Cast;
use glib::object::IsA;
use glib::StaticType;
use glib::ToValue;
use std::fmt;

glib::wrapper! {
#[doc(alias = "GtkHeaderBarAccessible")]
pub struct HeaderBarAccessible(Object<ffi::GtkHeaderBarAccessible, ffi::GtkHeaderBarAccessibleClass>) @extends atk::Object;

match fn {
type_ => || ffi::gtk_header_bar_accessible_get_type(),
}
}

impl HeaderBarAccessible {
pub const NONE: Option<&'static HeaderBarAccessible> = None;

// rustdoc-stripper-ignore-next
/// Creates a new builder-pattern struct instance to construct [`HeaderBarAccessible`] objects.
///
/// This method returns an instance of [`HeaderBarAccessibleBuilder`](crate::builders::HeaderBarAccessibleBuilder) which can be used to create [`HeaderBarAccessible`] objects.
pub fn builder() -> HeaderBarAccessibleBuilder {
HeaderBarAccessibleBuilder::default()
}
}

#[derive(Clone, Default)]
// rustdoc-stripper-ignore-next
/// A [builder-pattern] type to construct [`HeaderBarAccessible`] objects.
///
/// [builder-pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
#[must_use = "The builder must be built to be used"]
pub struct HeaderBarAccessibleBuilder {
accessible_description: Option<String>,
accessible_name: Option<String>,
accessible_parent: Option<atk::Object>,
accessible_role: Option<atk::Role>,
accessible_table_caption: Option<String>,
accessible_table_caption_object: Option<atk::Object>,
accessible_table_column_description: Option<String>,
accessible_table_column_header: Option<atk::Object>,
accessible_table_row_description: Option<String>,
accessible_table_row_header: Option<atk::Object>,
accessible_table_summary: Option<atk::Object>,
accessible_value: Option<f64>,
}

impl HeaderBarAccessibleBuilder {
// rustdoc-stripper-ignore-next
/// Create a new [`HeaderBarAccessibleBuilder`].
pub fn new() -> Self {
Self::default()
}

// rustdoc-stripper-ignore-next
/// Build the [`HeaderBarAccessible`].
#[must_use = "Building the object from the builder is usually expensive and is not expected to have side effects"]
pub fn build(self) -> HeaderBarAccessible {
let mut properties: Vec<(&str, &dyn ToValue)> = vec![];
if let Some(ref accessible_description) = self.accessible_description {
properties.push(("accessible-description", accessible_description));
}
if let Some(ref accessible_name) = self.accessible_name {
properties.push(("accessible-name", accessible_name));
}
if let Some(ref accessible_parent) = self.accessible_parent {
properties.push(("accessible-parent", accessible_parent));
}
if let Some(ref accessible_role) = self.accessible_role {
properties.push(("accessible-role", accessible_role));
}
if let Some(ref accessible_table_caption) = self.accessible_table_caption {
properties.push(("accessible-table-caption", accessible_table_caption));
}
if let Some(ref accessible_table_caption_object) = self.accessible_table_caption_object {
properties.push((
"accessible-table-caption-object",
accessible_table_caption_object,
));
}
if let Some(ref accessible_table_column_description) =
self.accessible_table_column_description
{
properties.push((
"accessible-table-column-description",
accessible_table_column_description,
));
}
if let Some(ref accessible_table_column_header) = self.accessible_table_column_header {
properties.push((
"accessible-table-column-header",
accessible_table_column_header,
));
}
if let Some(ref accessible_table_row_description) = self.accessible_table_row_description {
properties.push((
"accessible-table-row-description",
accessible_table_row_description,
));
}
if let Some(ref accessible_table_row_header) = self.accessible_table_row_header {
properties.push(("accessible-table-row-header", accessible_table_row_header));
}
if let Some(ref accessible_table_summary) = self.accessible_table_summary {
properties.push(("accessible-table-summary", accessible_table_summary));
}
if let Some(ref accessible_value) = self.accessible_value {
properties.push(("accessible-value", accessible_value));
}
glib::Object::new::<HeaderBarAccessible>(&properties)
.expect("Failed to create an instance of HeaderBarAccessible")
}

pub fn accessible_description(mut self, accessible_description: &str) -> Self {
self.accessible_description = Some(accessible_description.to_string());
self
}

pub fn accessible_name(mut self, accessible_name: &str) -> Self {
self.accessible_name = Some(accessible_name.to_string());
self
}

pub fn accessible_parent(mut self, accessible_parent: &impl IsA<atk::Object>) -> Self {
self.accessible_parent = Some(accessible_parent.clone().upcast());
self
}

pub fn accessible_role(mut self, accessible_role: atk::Role) -> Self {
self.accessible_role = Some(accessible_role);
self
}

pub fn accessible_table_caption(mut self, accessible_table_caption: &str) -> Self {
self.accessible_table_caption = Some(accessible_table_caption.to_string());
self
}

pub fn accessible_table_caption_object(
mut self,
accessible_table_caption_object: &impl IsA<atk::Object>,
) -> Self {
self.accessible_table_caption_object =
Some(accessible_table_caption_object.clone().upcast());
self
}

pub fn accessible_table_column_description(
mut self,
accessible_table_column_description: &str,
) -> Self {
self.accessible_table_column_description =
Some(accessible_table_column_description.to_string());
self
}

pub fn accessible_table_column_header(
mut self,
accessible_table_column_header: &impl IsA<atk::Object>,
) -> Self {
self.accessible_table_column_header = Some(accessible_table_column_header.clone().upcast());
self
}

pub fn accessible_table_row_description(
mut self,
accessible_table_row_description: &str,
) -> Self {
self.accessible_table_row_description = Some(accessible_table_row_description.to_string());
self
}

pub fn accessible_table_row_header(
mut self,
accessible_table_row_header: &impl IsA<atk::Object>,
) -> Self {
self.accessible_table_row_header = Some(accessible_table_row_header.clone().upcast());
self
}

pub fn accessible_table_summary(
mut self,
accessible_table_summary: &impl IsA<atk::Object>,
) -> Self {
self.accessible_table_summary = Some(accessible_table_summary.clone().upcast());
self
}

pub fn accessible_value(mut self, accessible_value: f64) -> Self {
self.accessible_value = Some(accessible_value);
self
}
}

impl fmt::Display for HeaderBarAccessible {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("HeaderBarAccessible")
}
}

0 comments on commit e07b204

Please sign in to comment.