[gtk+] GtkLabelAccessible: add a private struct
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkLabelAccessible: add a private struct
- Date: Mon, 15 Oct 2012 10:40:25 +0000 (UTC)
commit b8e4543ff3874edd604e78ac90d665b7f267ee8f
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Oct 14 19:51:14 2012 -0400
GtkLabelAccessible: add a private struct
Move instance fields to a private struct, in preparation
for installing a11y headers.
gtk/a11y/gtklabelaccessible.c | 35 +++++++++++++++++++++++------------
gtk/a11y/gtklabelaccessible.h | 9 ++++-----
2 files changed, 27 insertions(+), 17 deletions(-)
---
diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c
index b648186..8c55c29 100644
--- a/gtk/a11y/gtklabelaccessible.c
+++ b/gtk/a11y/gtklabelaccessible.c
@@ -21,6 +21,12 @@
#include <gtk/gtkpango.h>
#include "gtklabelaccessible.h"
+struct _GtkLabelAccessiblePrivate
+{
+ gchar *text;
+ gint cursor_position;
+ gint selection_bound;
+};
static void atk_text_interface_init (AtkTextIface *iface);
@@ -30,6 +36,9 @@ G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, _gtk_label_accessible, GTK_TYPE_WID
static void
_gtk_label_accessible_init (GtkLabelAccessible *label)
{
+ label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label,
+ GTK_TYPE_LABEL_ACCESSIBLE,
+ GtkLabelAccessiblePrivate);
}
static void
@@ -45,7 +54,7 @@ gtk_label_accessible_initialize (AtkObject *obj,
widget = GTK_WIDGET (data);
- accessible->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
+ accessible->priv->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
/*
* Check whether ancestor of GtkLabel is a GtkButton and if so
@@ -73,17 +82,17 @@ check_for_selection_change (GtkLabelAccessible *accessible,
if (gtk_label_get_selection_bounds (label, &start, &end))
{
- if (end != accessible->cursor_position ||
- start != accessible->selection_bound)
+ if (end != accessible->priv->cursor_position ||
+ start != accessible->priv->selection_bound)
ret_val = TRUE;
}
else
{
- ret_val = (accessible->cursor_position != accessible->selection_bound);
+ ret_val = (accessible->priv->cursor_position != accessible->priv->selection_bound);
}
- accessible->cursor_position = end;
- accessible->selection_bound = start;
+ accessible->priv->cursor_position = end;
+ accessible->priv->selection_bound = start;
return ret_val;
}
@@ -105,18 +114,18 @@ gtk_label_accessible_notify_gtk (GObject *obj,
const gchar *text;
text = gtk_label_get_text (GTK_LABEL (widget));
- if (g_strcmp0 (accessible->text, text) == 0)
+ if (g_strcmp0 (accessible->priv->text, text) == 0)
return;
/* Create a delete text and an insert text signal */
- length = g_utf8_strlen (accessible->text, -1);
+ length = g_utf8_strlen (accessible->priv->text, -1);
if (length > 0)
g_signal_emit_by_name (atk_obj, "text-changed::delete", 0, length);
- g_free (accessible->text);
- accessible->text = g_strdup (text);
+ g_free (accessible->priv->text);
+ accessible->priv->text = g_strdup (text);
- length = g_utf8_strlen (accessible->text, -1);
+ length = g_utf8_strlen (accessible->priv->text, -1);
if (length > 0)
g_signal_emit_by_name (atk_obj, "text-changed::insert", 0, length);
@@ -147,7 +156,7 @@ gtk_label_accessible_finalize (GObject *object)
{
GtkLabelAccessible *accessible = GTK_LABEL_ACCESSIBLE (object);
- g_free (accessible->text);
+ g_free (accessible->priv->text);
G_OBJECT_CLASS (_gtk_label_accessible_parent_class)->finalize (object);
}
@@ -277,6 +286,8 @@ _gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass)
class->ref_state_set = gtk_label_accessible_ref_state_set;
class->ref_relation_set = gtk_label_accessible_ref_relation_set;
class->initialize = gtk_label_accessible_initialize;
+
+ g_type_class_add_private (klass, sizeof (GtkLabelAccessiblePrivate));
}
/* atktext.h */
diff --git a/gtk/a11y/gtklabelaccessible.h b/gtk/a11y/gtklabelaccessible.h
index 50020f6..5e0060b 100644
--- a/gtk/a11y/gtklabelaccessible.h
+++ b/gtk/a11y/gtklabelaccessible.h
@@ -29,16 +29,15 @@ G_BEGIN_DECLS
#define GTK_IS_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL_ACCESSIBLE))
#define GTK_LABEL_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass))
-typedef struct _GtkLabelAccessible GtkLabelAccessible;
-typedef struct _GtkLabelAccessibleClass GtkLabelAccessibleClass;
+typedef struct _GtkLabelAccessible GtkLabelAccessible;
+typedef struct _GtkLabelAccessibleClass GtkLabelAccessibleClass;
+typedef struct _GtkLabelAccessiblePrivate GtkLabelAccessiblePrivate;
struct _GtkLabelAccessible
{
GtkWidgetAccessible parent;
- gchar *text;
- gint cursor_position;
- gint selection_bound;
+ GtkLabelAccessiblePrivate *priv;
};
struct _GtkLabelAccessibleClass
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]