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

GtkMenuItemAccessible: 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:01:37 -04:00
parent 9a41636988
commit f44c9dff3d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/a11y/gtkmenuitemaccessible.c
View File

@ -20,6 +20,11 @@
#include "gtkmenuitemaccessible.h" #include "gtkmenuitemaccessible.h"
#include "gtk/gtkmenuitemprivate.h" #include "gtk/gtkmenuitemprivate.h"
struct _GtkMenuItemAccessiblePrivate
{
gchar *text;
};
#define KEYBINDING_SEPARATOR ";" #define KEYBINDING_SEPARATOR ";"
static void menu_item_select (GtkMenuItem *item); static void menu_item_select (GtkMenuItem *item);
@ -193,10 +198,10 @@ gtk_menu_item_accessible_get_name (AtkObject *obj)
accessible = GTK_MENU_ITEM_ACCESSIBLE (obj); accessible = GTK_MENU_ITEM_ACCESSIBLE (obj);
label = get_label_from_container (widget); label = get_label_from_container (widget);
g_free (accessible->text); g_free (accessible->priv->text);
accessible->text = get_text_from_label_widget (label); accessible->priv->text = get_text_from_label_widget (label);
return accessible->text; return accessible->priv->text;
} }
static void static void
@ -204,7 +209,7 @@ gtk_menu_item_accessible_finalize (GObject *object)
{ {
GtkMenuItemAccessible *accessible = GTK_MENU_ITEM_ACCESSIBLE (object); GtkMenuItemAccessible *accessible = GTK_MENU_ITEM_ACCESSIBLE (object);
g_free (accessible->text); g_free (accessible->priv->text);
G_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->finalize (object);
} }
@ -244,11 +249,16 @@ _gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass)
class->initialize = gtk_menu_item_accessible_initialize; class->initialize = gtk_menu_item_accessible_initialize;
class->get_name = gtk_menu_item_accessible_get_name; class->get_name = gtk_menu_item_accessible_get_name;
class->get_role = gtk_menu_item_accessible_get_role; class->get_role = gtk_menu_item_accessible_get_role;
g_type_class_add_private (klass, sizeof (GtkMenuItemAccessiblePrivate));
} }
static void static void
_gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) _gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item)
{ {
menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_item,
GTK_TYPE_MENU_ITEM_ACCESSIBLE,
GtkMenuItemAccessiblePrivate);
} }
static GtkWidget * static GtkWidget *

7
gtk/a11y/gtkmenuitemaccessible.h
View File

@ -29,14 +29,15 @@ G_BEGIN_DECLS
#define GTK_IS_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE)) #define GTK_IS_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE))
#define GTK_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass)) #define GTK_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass))
typedef struct _GtkMenuItemAccessible GtkMenuItemAccessible; typedef struct _GtkMenuItemAccessible GtkMenuItemAccessible;
typedef struct _GtkMenuItemAccessibleClass GtkMenuItemAccessibleClass; typedef struct _GtkMenuItemAccessibleClass GtkMenuItemAccessibleClass;
typedef struct _GtkMenuItemAccessiblePrivate GtkMenuItemAccessiblePrivate;
struct _GtkMenuItemAccessible struct _GtkMenuItemAccessible
{ {
GtkContainerAccessible parent; GtkContainerAccessible parent;
gchar *text; GtkMenuItemAccessiblePrivate *priv;
}; };
struct _GtkMenuItemAccessibleClass struct _GtkMenuItemAccessibleClass