[gtk/wip/baedert/for-master: 47/74] label: Stop implementing destroy()
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 47/74] label: Stop implementing destroy()
- Date: Sat, 5 Oct 2019 09:42:19 +0000 (UTC)
commit bb118aca7a1ff0197b3a7258030e499e89ed76ee
Author: Timm Bäder <mail baedert org>
Date: Wed Oct 2 12:22:24 2019 +0200
label: Stop implementing destroy()
gtk/gtklabel.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 8e5573a967..e58287ff82 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -431,7 +431,7 @@ static void gtk_label_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
static void gtk_label_finalize (GObject *object);
-static void gtk_label_destroy (GtkWidget *widget);
+static void gtk_label_dispose (GObject *object);
static void gtk_label_size_allocate (GtkWidget *widget,
int width,
int height,
@@ -643,9 +643,9 @@ gtk_label_class_init (GtkLabelClass *class)
gobject_class->set_property = gtk_label_set_property;
gobject_class->get_property = gtk_label_get_property;
+ gobject_class->dispose = gtk_label_dispose;
gobject_class->finalize = gtk_label_finalize;
- widget_class->destroy = gtk_label_destroy;
widget_class->size_allocate = gtk_label_size_allocate;
widget_class->state_flags_changed = gtk_label_state_flags_changed;
widget_class->style_updated = gtk_label_style_updated;
@@ -3212,13 +3212,13 @@ gtk_label_get_wrap_mode (GtkLabel *label)
}
static void
-gtk_label_destroy (GtkWidget *widget)
+gtk_label_dispose (GObject *object)
{
- GtkLabel *label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (object);
gtk_label_set_mnemonic_widget (label, NULL);
- GTK_WIDGET_CLASS (gtk_label_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_label_parent_class)->dispose (object);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]