callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkRadioMenuItemAccessible: add a private struct

Browse Source 
Move instance fields to a private struct, in preparation
for installing a11y headers.
This commit is contained in:
Matthias Clasen
2012-10-14 20:48:30 -04:00
parent 8b6e962811
commit 06542b2b59
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/a11y/gtkradiomenuitemaccessible.c
View File

@ -20,6 +20,10 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkradiomenuitemaccessible.h" #include "gtkradiomenuitemaccessible.h"
struct _GtkRadioMenuItemAccessiblePrivate
{
GSList *old_group;
};
G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)
@ -43,7 +47,7 @@ gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj)
/* If the radio menu_item's group has changed remove the relation */ /* If the radio menu_item's group has changed remove the relation */
list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget));
if (radio_menu_item->old_group != list) if (radio_menu_item->priv->old_group != list)
{ {
AtkRelation *relation; AtkRelation *relation;
@ -54,7 +58,7 @@ gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj)
if (!atk_relation_set_contains (relation_set, ATK_RELATION_MEMBER_OF)) if (!atk_relation_set_contains (relation_set, ATK_RELATION_MEMBER_OF))
{ {
/* Get the members of the menu_item group */ /* Get the members of the menu_item group */
radio_menu_item->old_group = list; radio_menu_item->priv->old_group = list;
if (list) if (list)
{ {
AtkObject **accessible_array; AtkObject **accessible_array;
@ -102,10 +106,14 @@ _gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *kla
class->ref_relation_set = gtk_radio_menu_item_accessible_ref_relation_set; class->ref_relation_set = gtk_radio_menu_item_accessible_ref_relation_set;
class->initialize = gtk_radio_menu_item_accessible_initialize; class->initialize = gtk_radio_menu_item_accessible_initialize;
g_type_class_add_private (klass, sizeof (GtkRadioMenuItemAccessiblePrivate));
} }
static void static void
_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) _gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item)
{ {
radio_menu_item->old_group = NULL; radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item,
GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE,
GtkRadioMenuItemAccessiblePrivate);
} }

7
gtk/a11y/gtkradiomenuitemaccessible.h
View File

@ -29,14 +29,15 @@ G_BEGIN_DECLS
#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) #define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE))
#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass))
typedef struct _GtkRadioMenuItemAccessible GtkRadioMenuItemAccessible; typedef struct _GtkRadioMenuItemAccessible GtkRadioMenuItemAccessible;
typedef struct _GtkRadioMenuItemAccessibleClass GtkRadioMenuItemAccessibleClass; typedef struct _GtkRadioMenuItemAccessibleClass GtkRadioMenuItemAccessibleClass;
typedef struct _GtkRadioMenuItemAccessiblePrivate GtkRadioMenuItemAccessiblePrivate;
struct _GtkRadioMenuItemAccessible struct _GtkRadioMenuItemAccessible
{ {
GtkCheckMenuItemAccessible parent; GtkCheckMenuItemAccessible parent;
GSList *old_group; GtkRadioMenuItemAccessiblePrivate *priv;
}; };
struct _GtkRadioMenuItemAccessibleClass struct _GtkRadioMenuItemAccessibleClass