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/gtkthemingengine.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/gtkthemingengine.c')
| -rw-r--r-- | gtk/gtkthemingengine.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c index 006afe72c6..edb493ba61 100644 --- a/gtk/gtkthemingengine.c +++ b/gtk/gtkthemingengine.c @@ -74,8 +74,6 @@ struct GtkThemingEnginePrivate gchar *name; }; -#define GTK_THEMING_ENGINE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_THEMING_ENGINE, GtkThemingEnginePrivate)) - static void gtk_theming_engine_finalize (GObject *object); static void gtk_theming_engine_impl_set_property (GObject *object, guint prop_id, @@ -188,8 +186,7 @@ static void gtk_theming_engine_render_icon_surface (GtkThemingEngine *engine, gdouble x, gdouble y); -G_DEFINE_TYPE (GtkThemingEngine, gtk_theming_engine, G_TYPE_OBJECT) - +G_DEFINE_TYPE_WITH_PRIVATE (GtkThemingEngine, gtk_theming_engine, G_TYPE_OBJECT) typedef struct GtkThemingModule GtkThemingModule; typedef struct GtkThemingModuleClass GtkThemingModuleClass; @@ -266,14 +263,12 @@ gtk_theming_engine_class_init (GtkThemingEngineClass *klass) P_("Theming engine name"), NULL, G_PARAM_CONSTRUCT_ONLY | GTK_PARAM_READWRITE)); - - g_type_class_add_private (object_class, sizeof (GtkThemingEnginePrivate)); } static void gtk_theming_engine_init (GtkThemingEngine *engine) { - engine->priv = GTK_THEMING_ENGINE_GET_PRIVATE (engine); + engine->priv = gtk_theming_engine_get_instance_private (engine); } static void |