diff options
author | Matthias Clasen <mclasen@redhat.com> | 2012-12-27 01:04:46 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2012-12-27 11:23:22 -0500 |
commit | e4b5e94eb9500a83769771e6132f9abb08badb32 (patch) | |
tree | 5dea6143e46d636c3aa0faed50cf12db7b4b1715 /gtk/a11y/gtkwidgetaccessible.c | |
parent | 853b5e5fa2bd0c5f5260cb566470310fb72d8596 (diff) | |
download | gtk+-e4b5e94eb9500a83769771e6132f9abb08badb32.tar.gz |
Make accessible implementations public
This commit exposes the get_type() functions and standard
headers for accessible implementations. This makes it possible
to derive from the GTK accessible implementations without
GType magic tricks. This is necessary, because we require the
a11y type hierarchy to be parallel to the widget type hierarchy.
So, if you derive a widget and need to adjust its a11y implementation,
you have to be able to derive its accessible implementation.
This commit probably exposes more than is absolutely necessary,
it also exposes accessibles of widgets that are unlikely candidates
for deriving from.
Diffstat (limited to 'gtk/a11y/gtkwidgetaccessible.c')
-rw-r--r-- | gtk/a11y/gtkwidgetaccessible.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c index ebbcf3065d..5a1e27c623 100644 --- a/gtk/a11y/gtkwidgetaccessible.c +++ b/gtk/a11y/gtkwidgetaccessible.c @@ -21,7 +21,7 @@ #ifdef GDK_WINDOWING_X11 #include <gdk/x11/gdkx.h> #endif -#include "gtkwidgetaccessible.h" +#include "gtkwidgetaccessibleprivate.h" #include "gtknotebookpageaccessible.h" struct _GtkWidgetAccessiblePrivate @@ -39,7 +39,7 @@ static gboolean gtk_widget_accessible_all_parents_visible (GtkWidget *widget); static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkWidgetAccessible, _gtk_widget_accessible, GTK_TYPE_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkWidgetAccessible, gtk_widget_accessible, GTK_TYPE_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) /* Translate GtkWidget::focus-in/out-event to AtkObject::focus-event */ @@ -260,7 +260,7 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (_gtk_widget_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (gtk_widget_accessible_parent_class)->ref_relation_set (obj); if (GTK_IS_BOX (widget)) return relation_set; @@ -329,7 +329,7 @@ gtk_widget_accessible_ref_state_set (AtkObject *accessible) GtkWidget *widget; AtkStateSet *state_set; - state_set = ATK_OBJECT_CLASS (_gtk_widget_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_widget_accessible_parent_class)->ref_state_set (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -527,7 +527,7 @@ gtk_widget_accessible_get_attributes (AtkObject *obj) } static void -_gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) +gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -546,7 +546,7 @@ _gtk_widget_accessible_class_init (GtkWidgetAccessibleClass *klass) } static void -_gtk_widget_accessible_init (GtkWidgetAccessible *accessible) +gtk_widget_accessible_init (GtkWidgetAccessible *accessible) { accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, GTK_TYPE_WIDGET_ACCESSIBLE, |