[gtk/wip/baedert/for-master: 9/32] accellabel: Stop implementing destroy()
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 9/32] accellabel: Stop implementing destroy()
- Date: Sun, 6 Oct 2019 07:07:49 +0000 (UTC)
commit 8d342902e025ddc5203ccc8d32f47e3f68d020d2
Author: Timm Bäder <mail baedert org>
Date: Wed Oct 2 12:21:09 2019 +0200
accellabel: Stop implementing destroy()
gtk/gtkaccellabel.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 0906d7e76f..a74ecce475 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -158,7 +158,7 @@ static void gtk_accel_label_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_accel_label_destroy (GtkWidget *widget);
+static void gtk_accel_label_dispose (GObject *object);
static void gtk_accel_label_finalize (GObject *object);
G_DEFINE_TYPE_WITH_PRIVATE (GtkAccelLabel, gtk_accel_label, GTK_TYPE_WIDGET)
@@ -169,12 +169,11 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ gobject_class->dispose = gtk_accel_label_dispose;
gobject_class->finalize = gtk_accel_label_finalize;
gobject_class->set_property = gtk_accel_label_set_property;
gobject_class->get_property = gtk_accel_label_get_property;
- widget_class->destroy = gtk_accel_label_destroy;
-
gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ACCEL_LABEL);
#ifndef GDK_WINDOWING_QUARTZ
@@ -344,14 +343,14 @@ gtk_accel_label_new (const gchar *string)
}
static void
-gtk_accel_label_destroy (GtkWidget *widget)
+gtk_accel_label_dispose (GObject *object)
{
- GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (widget);
+ GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (object);
gtk_accel_label_set_accel_widget (accel_label, NULL);
gtk_accel_label_set_accel_closure (accel_label, NULL);
- GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_accel_label_parent_class)->dispose (object);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]