From 0899ef7cc9cf73824901923143f38bb9b6d224a3 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 27 Jun 2013 20:02:52 +0100 Subject: gtk: Use new macros for defining private data https://bugzilla.gnome.org/show_bug.cgi?id=702996 --- gtk/gtkcellarea.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gtk/gtkcellarea.c') diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index 715e4ae207..b7bad3d559 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -616,6 +616,7 @@ static guint cell_area_signals[LAST_SIGNAL] = { 0 }; #define PARAM_SPEC_SET_PARAM_ID(pspec, id) ((pspec)->param_id = (id)) G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkCellArea, gtk_cell_area, G_TYPE_INITIALLY_UNOWNED, + G_ADD_PRIVATE (GtkCellArea) G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT, gtk_cell_area_cell_layout_init) G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, @@ -626,9 +627,7 @@ gtk_cell_area_init (GtkCellArea *area) { GtkCellAreaPrivate *priv; - area->priv = G_TYPE_INSTANCE_GET_PRIVATE (area, - GTK_TYPE_CELL_AREA, - GtkCellAreaPrivate); + area->priv = gtk_cell_area_get_instance_private (area); priv = area->priv; priv->cell_info = g_hash_table_new_full (g_direct_hash, @@ -846,8 +845,6 @@ gtk_cell_area_class_init (GtkCellAreaClass *class) /* Pool for Cell Properties */ if (!cell_property_pool) cell_property_pool = g_param_spec_pool_new (FALSE); - - g_type_class_add_private (object_class, sizeof (GtkCellAreaPrivate)); } /************************************************************* -- cgit v1.2.1