[gtk+] gtkaccelgroup.c: Do not use GET_PRIV macro
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gtkaccelgroup.c: Do not use GET_PRIV macro
- Date: Thu, 2 Jun 2011 13:17:37 +0000 (UTC)
commit b8b54cdf3d86429e0ddcec6cdc3cb1756294ae97
Author: Javier Jardón <jjardon gnome org>
Date: Thu Jun 2 15:09:26 2011 +0200
gtkaccelgroup.c: Do not use GET_PRIV macro
gtk/gtkaccelgroup.c | 11 ++++++-----
gtk/gtkaccelgroupprivate.h | 2 --
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index a46ac68..b959258 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -62,8 +62,6 @@
* and mnemonics, of course.
*/
-#define GTK_ACCEL_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupPrivate))
-
/* --- prototypes --- */
static void gtk_accel_group_finalize (GObject *object);
static void gtk_accel_group_get_property (GObject *object,
@@ -228,15 +226,18 @@ gtk_accel_group_get_property (GObject *object,
static void
gtk_accel_group_init (GtkAccelGroup *accel_group)
{
- GtkAccelGroupPrivate *priv = GTK_ACCEL_GROUP_GET_PRIVATE (accel_group);
+ GtkAccelGroupPrivate *priv;
+
+ accel_group->priv = G_TYPE_INSTANCE_GET_PRIVATE (accel_group,
+ GTK_TYPE_ACCEL_GROUP,
+ GtkAccelGroupPrivate);
+ priv = accel_group->priv;
priv->lock_count = 0;
priv->modifier_mask = gtk_accelerator_get_default_mod_mask ();
priv->acceleratables = NULL;
priv->n_accels = 0;
priv->priv_accels = NULL;
-
- accel_group->priv = priv;
}
/**
diff --git a/gtk/gtkaccelgroupprivate.h b/gtk/gtkaccelgroupprivate.h
index af42d13..ab10191 100644
--- a/gtk/gtkaccelgroupprivate.h
+++ b/gtk/gtkaccelgroupprivate.h
@@ -22,8 +22,6 @@
#define __GTK_ACCEL_GROUP_PRIVATE_H__
-#define GTK_ACCEL_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ACCEL_GROUP, GtkAccelGroupPrivate))
-
struct _GtkAccelGroupPrivate
{
guint lock_count;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]