AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkaccelgroup.c: Do not use GET_PRIV macro

Browse Source
This commit is contained in:
Javier Jardón 2011-06-02 15:09:26 +02:00
parent cfffa32d4b
commit b8b54cdf3d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkaccelgroup.c
View File

@ -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;
}
/**

2
gtk/gtkaccelgroupprivate.h
View File

@ -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;