AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 23:24:16 +00:00
Code Issues Projects Releases Wiki Activity

GtkImageCellAccessible: 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 19:43:47 -04:00
parent 0bbfcc2491
commit 1ea3979864
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/a11y/gtkimagecellaccessible.c
View File

@ -20,6 +20,11 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkimagecellaccessible.h" #include "gtkimagecellaccessible.h"
struct _GtkImageCellAccessiblePrivate
{
gchar *image_description;
};
static void atk_image_interface_init (AtkImageIface *iface); static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkImageCellAccessible, _gtk_image_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, G_DEFINE_TYPE_WITH_CODE (GtkImageCellAccessible, _gtk_image_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE,
@ -30,7 +35,7 @@ gtk_image_cell_accessible_finalize (GObject *object)
{ {
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (object); GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (object);
g_free (image_cell->image_description); g_free (image_cell->priv->image_description);
G_OBJECT_CLASS (_gtk_image_cell_accessible_parent_class)->finalize (object); G_OBJECT_CLASS (_gtk_image_cell_accessible_parent_class)->finalize (object);
} }
@ -40,12 +45,16 @@ _gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gtk_image_cell_accessible_finalize; gobject_class->finalize = gtk_image_cell_accessible_finalize;
g_type_class_add_private (klass, sizeof (GtkImageCellAccessiblePrivate));
} }
static void static void
_gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell) _gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell)
{ {
image_cell->image_description = NULL; image_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_cell,
GTK_TYPE_IMAGE_CELL_ACCESSIBLE,
GtkImageCellAccessiblePrivate);
} }
static const gchar * static const gchar *
@ -53,7 +62,7 @@ gtk_image_cell_accessible_get_image_description (AtkImage *image)
{ {
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image); GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image);
return image_cell->image_description; return image_cell->priv->image_description;
} }
static gboolean static gboolean
@ -62,10 +71,10 @@ gtk_image_cell_accessible_set_image_description (AtkImage *image,
{ {
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image); GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image);
g_free (image_cell->image_description); g_free (image_cell->priv->image_description);
image_cell->image_description = g_strdup (description); image_cell->priv->image_description = g_strdup (description);
if (image_cell->image_description) if (image_cell->priv->image_description)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;

8
gtk/a11y/gtkimagecellaccessible.h
View File

@ -30,15 +30,15 @@ G_BEGIN_DECLS
#define GTK_IS_IMAGE_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_CELL_ACCESSIBLE)) #define GTK_IS_IMAGE_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_CELL_ACCESSIBLE))
#define GTK_IMAGE_CELL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass)) #define GTK_IMAGE_CELL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass))
typedef struct _GtkImageCellAccessible GtkImageCellAccessible; typedef struct _GtkImageCellAccessible GtkImageCellAccessible;
typedef struct _GtkImageCellAccessibleClass GtkImageCellAccessibleClass; typedef struct _GtkImageCellAccessibleClass GtkImageCellAccessibleClass;
typedef struct _GtkImageCellAccessiblePrivate GtkImageCellAccessiblePrivate;
struct _GtkImageCellAccessible struct _GtkImageCellAccessible
{ {
GtkRendererCellAccessible parent; GtkRendererCellAccessible parent;
gchar *image_description; GtkImageCellAccessiblePrivate *priv;
gint x, y;
}; };
struct _GtkImageCellAccessibleClass struct _GtkImageCellAccessibleClass