diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-27 20:02:52 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-07-09 09:30:02 +0100 |
| commit | 0899ef7cc9cf73824901923143f38bb9b6d224a3 (patch) | |
| tree | 16207a8837da8a89a6f4a1d1a1c23074fd29aa1d /gtk/gtksizegroup.c | |
| parent | 365919d5f6da0a8648815ca5cf5805fb88c9be16 (diff) | |
| download | gtk+-0899ef7cc9cf73824901923143f38bb9b6d224a3.tar.gz | |
gtk: Use new macros for defining private data
https://bugzilla.gnome.org/show_bug.cgi?id=702996
Diffstat (limited to 'gtk/gtksizegroup.c')
| -rw-r--r-- | gtk/gtksizegroup.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index f84ed47f48..bb949c65ec 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -151,6 +151,11 @@ G_STATIC_ASSERT (GTK_SIZE_GROUP_HORIZONTAL == (1 << GTK_ORIENTATION_HORIZONTAL)) G_STATIC_ASSERT (GTK_SIZE_GROUP_VERTICAL == (1 << GTK_ORIENTATION_VERTICAL)); G_STATIC_ASSERT (GTK_SIZE_GROUP_BOTH == (GTK_SIZE_GROUP_HORIZONTAL | GTK_SIZE_GROUP_VERTICAL)); +G_DEFINE_TYPE_WITH_CODE (GtkSizeGroup, gtk_size_group, G_TYPE_OBJECT, + G_ADD_PRIVATE (GtkSizeGroup) + G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, + gtk_size_group_buildable_init)) + static void add_widget_to_closure (GHashTable *widgets, GHashTable *groups, @@ -343,8 +348,6 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass) "when determining the size of the group"), FALSE, GTK_PARAM_READWRITE)); - - g_type_class_add_private (klass, sizeof (GtkSizeGroupPrivate)); } static void @@ -352,9 +355,7 @@ gtk_size_group_init (GtkSizeGroup *size_group) { GtkSizeGroupPrivate *priv; - size_group->priv = G_TYPE_INSTANCE_GET_PRIVATE (size_group, - GTK_TYPE_SIZE_GROUP, - GtkSizeGroupPrivate); + size_group->priv = gtk_size_group_get_instance_private (size_group); priv = size_group->priv; priv->widgets = NULL; @@ -369,10 +370,6 @@ gtk_size_group_buildable_init (GtkBuildableIface *iface) iface->custom_finished = gtk_size_group_buildable_custom_finished; } -G_DEFINE_TYPE_WITH_CODE (GtkSizeGroup, gtk_size_group, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, - gtk_size_group_buildable_init)) - static void gtk_size_group_set_property (GObject *object, guint prop_id, |