Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Add renaming for WidgetExt::set_name and BuildableExt::set_name #917

Merged
merged 2 commits into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2441,6 +2441,12 @@ manual_traits = ["WidgetExtManual"]
[[object.function.parameter]]
name = "region"
const = true
[[object.function]]
name = "set_name"
rename = "set_widget_name"
[[object.function]]
name = "get_name"
rename = "get_widget_name"

[[object]]
name = "Gtk.Window"
Expand Down
2 changes: 1 addition & 1 deletion src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 6c8c7c4)
Generated by gir (https://github.com/gtk-rs/gir @ f0ecd66)
from gir-files (https://github.com/gtk-rs/gir-files @ 22748fa)
8 changes: 4 additions & 4 deletions src/auto/widget.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ pub trait WidgetExt: 'static {

fn get_modifier_mask(&self, intent: gdk::ModifierIntent) -> gdk::ModifierType;

fn get_name(&self) -> Option<GString>;
fn get_widget_name(&self) -> Option<GString>;

fn get_no_show_all(&self) -> bool;

Expand Down Expand Up @@ -498,7 +498,7 @@ pub trait WidgetExt: 'static {

fn set_margin_top(&self, margin: i32);

fn set_name(&self, name: &str);
fn set_widget_name(&self, name: &str);

fn set_no_show_all(&self, no_show_all: bool);

Expand Down Expand Up @@ -1644,7 +1644,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
}
}

fn get_name(&self) -> Option<GString> {
fn get_widget_name(&self) -> Option<GString> {
unsafe { from_glib_none(gtk_sys::gtk_widget_get_name(self.as_ref().to_glib_none().0)) }
}

Expand Down Expand Up @@ -2541,7 +2541,7 @@ impl<O: IsA<Widget>> WidgetExt for O {
}
}

fn set_name(&self, name: &str) {
fn set_widget_name(&self, name: &str) {
unsafe {
gtk_sys::gtk_widget_set_name(self.as_ref().to_glib_none().0, name.to_glib_none().0);
}
Expand Down
8 changes: 4 additions & 4 deletions src/buildable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ use gtk_sys;
use Buildable;

pub trait BuildableExtManual: 'static {
fn get_name(&self) -> Option<String>;
fn get_buildable_name(&self) -> Option<String>;

fn set_name(&self, name: &str);
fn set_buildable_name(&self, name: &str);
}

impl<O: IsA<Buildable>> BuildableExtManual for O {
fn get_name(&self) -> Option<String> {
fn get_buildable_name(&self) -> Option<String> {
unsafe {
from_glib_none(gtk_sys::gtk_buildable_get_name(
self.as_ref().to_glib_none().0,
))
}
}

fn set_name(&self, name: &str) {
fn set_buildable_name(&self, name: &str) {
unsafe {
gtk_sys::gtk_buildable_set_name(self.as_ref().to_glib_none().0, name.to_glib_none().0);
}
Expand Down