summaryrefslogtreecommitdiff
path: root/gtk/gtkbin.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2013-06-27 20:02:52 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2013-07-09 09:30:02 +0100
commit0899ef7cc9cf73824901923143f38bb9b6d224a3 (patch)
tree16207a8837da8a89a6f4a1d1a1c23074fd29aa1d /gtk/gtkbin.c
parent365919d5f6da0a8648815ca5cf5805fb88c9be16 (diff)
downloadgtk+-0899ef7cc9cf73824901923143f38bb9b6d224a3.tar.gz
gtk: Use new macros for defining private data
https://bugzilla.gnome.org/show_bug.cgi?id=702996
Diffstat (limited to 'gtk/gtkbin.c')
-rw-r--r--gtk/gtkbin.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index b64f54156d..86d1742cb8 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -73,7 +73,7 @@ static void gtk_bin_get_preferred_height_for_width (GtkWidget
static void gtk_bin_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-G_DEFINE_ABSTRACT_TYPE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GtkBin, gtk_bin, GTK_TYPE_CONTAINER)
static void
gtk_bin_class_init (GtkBinClass *class)
@@ -91,23 +91,14 @@ gtk_bin_class_init (GtkBinClass *class)
container_class->remove = gtk_bin_remove;
container_class->forall = gtk_bin_forall;
container_class->child_type = gtk_bin_child_type;
-
- g_type_class_add_private (class, sizeof (GtkBinPrivate));
}
static void
gtk_bin_init (GtkBin *bin)
{
- GtkBinPrivate *priv;
-
- bin->priv = G_TYPE_INSTANCE_GET_PRIVATE (bin,
- GTK_TYPE_BIN,
- GtkBinPrivate);
- priv = bin->priv;
+ bin->priv = gtk_bin_get_instance_private (bin);
gtk_widget_set_has_window (GTK_WIDGET (bin), FALSE);
-
- priv->child = NULL;
}