[gtk+] GtkImageCellAccessible: add a private struct
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkImageCellAccessible: add a private struct
- Date: Mon, 15 Oct 2012 10:40:20 +0000 (UTC)
commit 1ea3979864bbafa7261bfd34297f877b86bf0f48
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Oct 14 19:43:47 2012 -0400
GtkImageCellAccessible: add a private struct
Move instance fields to a private struct, in preparation
for installing a11y headers.
gtk/a11y/gtkimagecellaccessible.c | 21 +++++++++++++++------
gtk/a11y/gtkimagecellaccessible.h | 8 ++++----
2 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c
index 613f58b..9463c9e 100644
--- a/gtk/a11y/gtkimagecellaccessible.c
+++ b/gtk/a11y/gtkimagecellaccessible.c
@@ -20,6 +20,11 @@
#include <gtk/gtk.h>
#include "gtkimagecellaccessible.h"
+struct _GtkImageCellAccessiblePrivate
+{
+ gchar *image_description;
+};
+
static void atk_image_interface_init (AtkImageIface *iface);
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);
- g_free (image_cell->image_description);
+ g_free (image_cell->priv->image_description);
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);
gobject_class->finalize = gtk_image_cell_accessible_finalize;
+
+ g_type_class_add_private (klass, sizeof (GtkImageCellAccessiblePrivate));
}
static void
_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 *
@@ -53,7 +62,7 @@ gtk_image_cell_accessible_get_image_description (AtkImage *image)
{
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image);
- return image_cell->image_description;
+ return image_cell->priv->image_description;
}
static gboolean
@@ -62,10 +71,10 @@ gtk_image_cell_accessible_set_image_description (AtkImage *image,
{
GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image);
- g_free (image_cell->image_description);
- image_cell->image_description = g_strdup (description);
+ g_free (image_cell->priv->image_description);
+ image_cell->priv->image_description = g_strdup (description);
- if (image_cell->image_description)
+ if (image_cell->priv->image_description)
return TRUE;
else
return FALSE;
diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
index f777a56..99862cc 100644
--- a/gtk/a11y/gtkimagecellaccessible.h
+++ b/gtk/a11y/gtkimagecellaccessible.h
@@ -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_IMAGE_CELL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass))
-typedef struct _GtkImageCellAccessible GtkImageCellAccessible;
-typedef struct _GtkImageCellAccessibleClass GtkImageCellAccessibleClass;
+typedef struct _GtkImageCellAccessible GtkImageCellAccessible;
+typedef struct _GtkImageCellAccessibleClass GtkImageCellAccessibleClass;
+typedef struct _GtkImageCellAccessiblePrivate GtkImageCellAccessiblePrivate;
struct _GtkImageCellAccessible
{
GtkRendererCellAccessible parent;
- gchar *image_description;
- gint x, y;
+ GtkImageCellAccessiblePrivate *priv;
};
struct _GtkImageCellAccessibleClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]