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

Commit 37006dc

Browse files
GuillaumeGomezGuillaumeGomez
authored
Merge pull request #787 from pbor/0-16-backports
0.16 backports
2 parents dd66a84 + 21ff787 commit 37006dc

File tree

20 files changed

+135
-194
lines changed

20 files changed

+135
-194
lines changed

‎examples/basic_subclass/simple_application/imp.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ impl ApplicationImpl for SimpleApplication {
4646
fn startup(&self) {
4747
self.parent_startup();
4848

49-
let window = SimpleWindow::new(&self.instance());
49+
let window = SimpleWindow::new(&self.obj());
5050
self.window
5151
.set(window)
5252
.expect("Failed to initialize application window");

‎examples/basic_subclass/simple_window/imp.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl ObjectImpl for SimpleWindow {
3030
fn constructed(&self) {
3131
self.parent_constructed();
3232

33-
let instance = self.instance();
33+
let instance = self.obj();
3434

3535
let headerbar = gtk::HeaderBar::new();
3636
let increment = gtk::Button::with_label("Increment!");

‎examples/composite_template/example_application_window/imp.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl ObjectSubclass for ExampleApplicationWindow {
3939

4040
impl ObjectImpl for ExampleApplicationWindow {
4141
fn constructed(&self) {
42-
self.instance().init_label();
42+
self.obj().init_label();
4343
self.parent_constructed();
4444
}
4545
}

‎gtk/src/subclass/application.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ impl<T: GtkApplicationImpl> GtkApplicationImplExt for T {
3333
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkApplicationClass;
3434
if let Some(f) = (*parent_class).window_added {
3535
f(
36-
self.instance()
37-
.unsafe_cast_ref::<Application>()
38-
.to_glib_none()
39-
.0,
36+
self.obj().unsafe_cast_ref::<Application>().to_glib_none().0,
4037
window.to_glib_none().0,
4138
)
4239
}
@@ -49,10 +46,7 @@ impl<T: GtkApplicationImpl> GtkApplicationImplExt for T {
4946
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkApplicationClass;
5047
if let Some(f) = (*parent_class).window_removed {
5148
f(
52-
self.instance()
53-
.unsafe_cast_ref::<Application>()
54-
.to_glib_none()
55-
.0,
49+
self.obj().unsafe_cast_ref::<Application>().to_glib_none().0,
5650
window.to_glib_none().0,
5751
)
5852
}

‎gtk/src/subclass/button.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<T: ButtonImpl> ButtonImplExt for T {
2828
let data = T::type_data();
2929
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkButtonClass;
3030
if let Some(f) = (*parent_class).activate {
31-
f(self.instance().unsafe_cast_ref::<Button>().to_glib_none().0)
31+
f(self.obj().unsafe_cast_ref::<Button>().to_glib_none().0)
3232
}
3333
}
3434
}
@@ -38,7 +38,7 @@ impl<T: ButtonImpl> ButtonImplExt for T {
3838
let data = T::type_data();
3939
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkButtonClass;
4040
if let Some(f) = (*parent_class).clicked {
41-
f(self.instance().unsafe_cast_ref::<Button>().to_glib_none().0)
41+
f(self.obj().unsafe_cast_ref::<Button>().to_glib_none().0)
4242
}
4343
}
4444
}

‎gtk/src/subclass/cell_renderer.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
150150
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
151151
let f = (*parent_class).get_request_mode.unwrap();
152152
from_glib(f(self
153-
.instance()
153+
.obj()
154154
.unsafe_cast_ref::<CellRenderer>()
155155
.to_glib_none()
156156
.0))
@@ -166,7 +166,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
166166
let mut minimum_size = mem::MaybeUninit::uninit();
167167
let mut natural_size = mem::MaybeUninit::uninit();
168168
f(
169-
self.instance()
169+
self.obj()
170170
.unsafe_cast_ref::<CellRenderer>()
171171
.to_glib_none()
172172
.0,
@@ -191,7 +191,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
191191
let mut minimum_size = mem::MaybeUninit::uninit();
192192
let mut natural_size = mem::MaybeUninit::uninit();
193193
f(
194-
self.instance()
194+
self.obj()
195195
.unsafe_cast_ref::<CellRenderer>()
196196
.to_glib_none()
197197
.0,
@@ -211,7 +211,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
211211
let mut minimum_size = mem::MaybeUninit::uninit();
212212
let mut natural_size = mem::MaybeUninit::uninit();
213213
f(
214-
self.instance()
214+
self.obj()
215215
.unsafe_cast_ref::<CellRenderer>()
216216
.to_glib_none()
217217
.0,
@@ -234,7 +234,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
234234
let mut minimum_size = mem::MaybeUninit::uninit();
235235
let mut natural_size = mem::MaybeUninit::uninit();
236236
f(
237-
self.instance()
237+
self.obj()
238238
.unsafe_cast_ref::<CellRenderer>()
239239
.to_glib_none()
240240
.0,
@@ -259,7 +259,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
259259
let mut aligned_area = gdk::Rectangle::uninitialized();
260260
let f = (*parent_class).get_aligned_area.unwrap();
261261
f(
262-
self.instance()
262+
self.obj()
263263
.unsafe_cast_ref::<CellRenderer>()
264264
.to_glib_none()
265265
.0,
@@ -285,7 +285,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
285285
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
286286
if let Some(f) = (*parent_class).render {
287287
f(
288-
self.instance()
288+
self.obj()
289289
.unsafe_cast_ref::<CellRenderer>()
290290
.to_glib_none()
291291
.0,
@@ -313,7 +313,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
313313
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
314314
if let Some(f) = (*parent_class).activate {
315315
from_glib(f(
316-
self.instance()
316+
self.obj()
317317
.unsafe_cast_ref::<CellRenderer>()
318318
.to_glib_none()
319319
.0,
@@ -344,7 +344,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
344344
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
345345
if let Some(f) = (*parent_class).start_editing {
346346
from_glib_none(f(
347-
self.instance()
347+
self.obj()
348348
.unsafe_cast_ref::<CellRenderer>()
349349
.to_glib_none()
350350
.0,
@@ -367,7 +367,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
367367
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
368368
if let Some(f) = (*parent_class).editing_canceled {
369369
f(self
370-
.instance()
370+
.obj()
371371
.unsafe_cast_ref::<CellRenderer>()
372372
.to_glib_none()
373373
.0)
@@ -381,7 +381,7 @@ impl<T: CellRendererImpl> CellRendererImplExt for T {
381381
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererClass;
382382
if let Some(f) = (*parent_class).editing_started {
383383
f(
384-
self.instance()
384+
self.obj()
385385
.unsafe_cast_ref::<CellRenderer>()
386386
.to_glib_none()
387387
.0,

‎gtk/src/subclass/cell_renderer_accel.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl<T: CellRendererAccelImpl> CellRendererAccelImplExt for T {
4949
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererAccelClass;
5050
if let Some(f) = (*parent_class).accel_edited {
5151
f(
52-
self.instance()
52+
self.obj()
5353
.unsafe_cast_ref::<CellRendererAccel>()
5454
.to_glib_none()
5555
.0,
@@ -68,7 +68,7 @@ impl<T: CellRendererAccelImpl> CellRendererAccelImplExt for T {
6868
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererAccelClass;
6969
if let Some(f) = (*parent_class).accel_cleared {
7070
f(
71-
self.instance()
71+
self.obj()
7272
.unsafe_cast_ref::<CellRendererAccel>()
7373
.to_glib_none()
7474
.0,

‎gtk/src/subclass/cell_renderer_text.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl<T: CellRendererTextImpl> CellRendererTextImplExt for T {
2727
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererTextClass;
2828
if let Some(f) = (*parent_class).edited {
2929
f(
30-
self.instance()
30+
self.obj()
3131
.unsafe_cast_ref::<CellRendererText>()
3232
.to_glib_none()
3333
.0,

‎gtk/src/subclass/cell_renderer_toggle.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl<T: CellRendererToggleImpl> CellRendererToggleImplExt for T {
2727
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkCellRendererToggleClass;
2828
if let Some(f) = (*parent_class).toggled {
2929
f(
30-
self.instance()
30+
self.obj()
3131
.unsafe_cast_ref::<CellRendererToggle>()
3232
.to_glib_none()
3333
.0,

‎gtk/src/subclass/container.rs‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
5959
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
6060
if let Some(f) = (*parent_class).add {
6161
f(
62-
self.instance()
63-
.unsafe_cast_ref::<Container>()
64-
.to_glib_none()
65-
.0,
62+
self.obj().unsafe_cast_ref::<Container>().to_glib_none().0,
6663
widget.to_glib_none().0,
6764
)
6865
}
@@ -75,10 +72,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
7572
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
7673
if let Some(f) = (*parent_class).remove {
7774
f(
78-
self.instance()
79-
.unsafe_cast_ref::<Container>()
80-
.to_glib_none()
81-
.0,
75+
self.obj().unsafe_cast_ref::<Container>().to_glib_none().0,
8276
widget.to_glib_none().0,
8377
)
8478
}
@@ -90,11 +84,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
9084
let data = T::type_data();
9185
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
9286
if let Some(f) = (*parent_class).check_resize {
93-
f(self
94-
.instance()
95-
.unsafe_cast_ref::<Container>()
96-
.to_glib_none()
97-
.0)
87+
f(self.obj().unsafe_cast_ref::<Container>().to_glib_none().0)
9888
}
9989
}
10090
}
@@ -105,10 +95,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
10595
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
10696
if let Some(f) = (*parent_class).set_focus_child {
10797
f(
108-
self.instance()
109-
.unsafe_cast_ref::<Container>()
110-
.to_glib_none()
111-
.0,
98+
self.obj().unsafe_cast_ref::<Container>().to_glib_none().0,
11299
widget.to_glib_none().0,
113100
)
114101
}
@@ -121,7 +108,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
121108
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
122109
if let Some(f) = (*parent_class).child_type {
123110
from_glib(f(self
124-
.instance()
111+
.obj()
125112
.unsafe_cast_ref::<Container>()
126113
.to_glib_none()
127114
.0))
@@ -139,10 +126,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
139126
.get_path_for_child
140127
.expect("No parent class impl for \"get_path_for_child\"");
141128
from_glib_none(f(
142-
self.instance()
143-
.unsafe_cast_ref::<Container>()
144-
.to_glib_none()
145-
.0,
129+
self.obj().unsafe_cast_ref::<Container>().to_glib_none().0,
146130
widget.to_glib_none().0,
147131
))
148132
}
@@ -154,10 +138,7 @@ impl<T: ContainerImpl> ContainerImplExt for T {
154138
let parent_class = data.as_ref().parent_class() as *mut ffi::GtkContainerClass;
155139
if let Some(f) = (*parent_class).forall {
156140
f(
157-
self.instance()
158-
.unsafe_cast_ref::<Container>()
159-
.to_glib_none()
160-
.0,
141+
self.obj().unsafe_cast_ref::<Container>().to_glib_none().0,
161142
include_internals.into_glib(),
162143
callback.callback,
163144
callback.user_data,

0 commit comments

Comments
 (0)