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/gtkiconhelper.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/gtkiconhelper.c')
-rw-r--r-- | gtk/gtkiconhelper.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 0e38073592..a516d27542 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -22,8 +22,6 @@ #include <math.h> #include "gtkiconhelperprivate.h" -G_DEFINE_TYPE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT) - struct _GtkIconHelperPrivate { GtkImageType storage_type; @@ -54,6 +52,8 @@ struct _GtkIconHelperPrivate { gint last_surface_scale; }; +G_DEFINE_TYPE_WITH_PRIVATE (GtkIconHelper, _gtk_icon_helper, G_TYPE_OBJECT) + void _gtk_icon_helper_clear (GtkIconHelper *self) { @@ -130,14 +130,12 @@ _gtk_icon_helper_class_init (GtkIconHelperClass *klass) oclass = G_OBJECT_CLASS (klass); oclass->finalize = gtk_icon_helper_finalize; - - g_type_class_add_private (klass, sizeof (GtkIconHelperPrivate)); } static void _gtk_icon_helper_init (GtkIconHelper *self) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTK_TYPE_ICON_HELPER, GtkIconHelperPrivate); + self->priv = _gtk_icon_helper_get_instance_private (self); self->priv->storage_type = GTK_IMAGE_EMPTY; self->priv->icon_size = GTK_ICON_SIZE_INVALID; |