diff options
| -rw-r--r-- | gtk/a11y/gtktextviewaccessible.c | 19 | ||||
| -rw-r--r-- | gtk/a11y/gtktextviewaccessible.h | 8 |
2 files changed, 18 insertions, 9 deletions
diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index 8931754b86..67d6ac641e 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -31,6 +31,11 @@ #include "gtktextviewaccessible.h" #include "gtk/gtkwidgetprivate.h" +struct _GtkTextViewAccessiblePrivate +{ + gint insert_offset; + gint selection_bound; +}; static void insert_text_cb (GtkTextBuffer *buffer, GtkTextIter *arg1, @@ -152,11 +157,16 @@ _gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) class->initialize = gtk_text_view_accessible_initialize; widget_class->notify_gtk = gtk_text_view_accessible_notify_gtk; + + g_type_class_add_private (klass, sizeof (GtkTextViewAccessiblePrivate)); } static void _gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) { + accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, + GTK_TYPE_TEXT_VIEW_ACCESSIBLE, + GtkTextViewAccessiblePrivate); } static gchar * @@ -569,7 +579,6 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, gdouble scale = 1; gboolean val_set = FALSE; - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); if (widget == NULL) return NULL; @@ -1715,8 +1724,8 @@ gtk_text_view_accessible_update_cursor (GtkTextViewAccessible *accessible, int insert_offset, selection_bound; GtkTextIter iter; - prev_insert_offset = accessible->insert_offset; - prev_selection_bound = accessible->selection_bound; + prev_insert_offset = accessible->priv->insert_offset; + prev_selection_bound = accessible->priv->selection_bound; gtk_text_buffer_get_iter_at_mark (buffer, &iter, gtk_text_buffer_get_insert (buffer)); insert_offset = gtk_text_iter_get_offset (&iter); @@ -1726,8 +1735,8 @@ gtk_text_view_accessible_update_cursor (GtkTextViewAccessible *accessible, if (prev_insert_offset == insert_offset && prev_selection_bound == selection_bound) return; - accessible->insert_offset = insert_offset; - accessible->selection_bound = selection_bound; + accessible->priv->insert_offset = insert_offset; + accessible->priv->selection_bound = selection_bound; if (prev_insert_offset != insert_offset) g_signal_emit_by_name (accessible, "text-caret-moved", insert_offset); diff --git a/gtk/a11y/gtktextviewaccessible.h b/gtk/a11y/gtktextviewaccessible.h index 3831754b27..3028b12304 100644 --- a/gtk/a11y/gtktextviewaccessible.h +++ b/gtk/a11y/gtktextviewaccessible.h @@ -29,15 +29,15 @@ G_BEGIN_DECLS #define GTK_IS_TEXT_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_VIEW_ACCESSIBLE)) #define GTK_TEXT_VIEW_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessibleClass)) -typedef struct _GtkTextViewAccessible GtkTextViewAccessible; -typedef struct _GtkTextViewAccessibleClass GtkTextViewAccessibleClass; +typedef struct _GtkTextViewAccessible GtkTextViewAccessible; +typedef struct _GtkTextViewAccessibleClass GtkTextViewAccessibleClass; +typedef struct _GtkTextViewAccessiblePrivate GtkTextViewAccessiblePrivate; struct _GtkTextViewAccessible { GtkContainerAccessible parent; - gint insert_offset; - gint selection_bound; + GtkTextViewAccessiblePrivate *priv; }; struct _GtkTextViewAccessibleClass |