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 | |
| 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.
102 files changed, 760 insertions, 543 deletions
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am index 9d0471bbfc..cc0bb7c7e1 100644 --- a/gtk/a11y/Makefile.am +++ b/gtk/a11y/Makefile.am @@ -53,14 +53,12 @@ gail_c_sources = \ gailmisc.c gail_private_h_sources = \ - gail.h \ gtkarrowaccessible.h \ gtkbooleancellaccessible.h \ gtkbuttonaccessible.h \ gtkcellaccessible.h \ gtkcellaccessibleparent.h \ gtkcheckmenuitemaccessible.h \ - gtkcolorswatchaccessible.h \ gtkcomboboxaccessible.h \ gtkcontaineraccessible.h \ gtkcontainercellaccessible.h \ @@ -99,6 +97,14 @@ gail_private_h_sources = \ gtktreeviewaccessible.h \ gtkwidgetaccessible.h \ gtkwindowaccessible.h \ + gtkcolorswatchaccessible.h \ + gtkcellaccessibleprivate.h \ + gtklockbuttonaccessibleprivate.h \ + gtkiconviewaccessibleprivate.h \ + gtktreeviewaccessibleprivate.h \ + gtktextviewaccessibleprivate.h \ + gtkwidgetaccessibleprivate.h \ + gail.h \ gailutil.h \ gailmisc.h diff --git a/gtk/a11y/gtkarrowaccessible.c b/gtk/a11y/gtkarrowaccessible.c index 9950158a6a..3d4a44ddae 100644 --- a/gtk/a11y/gtkarrowaccessible.c +++ b/gtk/a11y/gtkarrowaccessible.c @@ -27,14 +27,14 @@ struct _GtkArrowAccessiblePrivate static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, _gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) static void gtk_arrow_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_ICON; } @@ -46,11 +46,11 @@ gtk_arrow_accessible_finalize (GObject *object) g_free (arrow->priv->image_description); - G_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->finalize (object); } static void -_gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) +gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -63,7 +63,7 @@ _gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass) } static void -_gtk_arrow_accessible_init (GtkArrowAccessible *arrow) +gtk_arrow_accessible_init (GtkArrowAccessible *arrow) { arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow, GTK_TYPE_ARROW_ACCESSIBLE, diff --git a/gtk/a11y/gtkarrowaccessible.h b/gtk/a11y/gtkarrowaccessible.h index 6b1a697fc8..dbbdf56a29 100644 --- a/gtk/a11y/gtkarrowaccessible.h +++ b/gtk/a11y/gtkarrowaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_ARROW_ACCESSIBLE (_gtk_arrow_accessible_get_type ()) +#define GTK_TYPE_ARROW_ACCESSIBLE (gtk_arrow_accessible_get_type ()) #define GTK_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessible)) #define GTK_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass)) #define GTK_IS_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkArrowAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_arrow_accessible_get_type (void); +GType gtk_arrow_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkbooleancellaccessible.c b/gtk/a11y/gtkbooleancellaccessible.c index eaa20f0435..e892f49db6 100644 --- a/gtk/a11y/gtkbooleancellaccessible.c +++ b/gtk/a11y/gtkbooleancellaccessible.c @@ -76,7 +76,7 @@ gtk_boolean_cell_accessible_action_interface_init (AtkActionIface *iface) } -G_DEFINE_TYPE_EXTENDED (GtkBooleanCellAccessible, _gtk_boolean_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, 0, +G_DEFINE_TYPE_EXTENDED (GtkBooleanCellAccessible, gtk_boolean_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, 0, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, gtk_boolean_cell_accessible_action_interface_init)) @@ -86,7 +86,7 @@ gtk_boolean_cell_accessible_ref_state_set (AtkObject *accessible) GtkBooleanCellAccessible *cell = GTK_BOOLEAN_CELL_ACCESSIBLE (accessible); AtkStateSet *state_set; - state_set = ATK_OBJECT_CLASS (_gtk_boolean_cell_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_boolean_cell_accessible_parent_class)->ref_state_set (accessible); if (cell->priv->cell_value) atk_state_set_add_state (state_set, ATK_STATE_CHECKED); @@ -130,7 +130,7 @@ gtk_boolean_cell_accessible_update_cache (GtkCellAccessible *cell) } static void -_gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass) +gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass) { GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass); AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass); @@ -143,7 +143,7 @@ _gtk_boolean_cell_accessible_class_init (GtkBooleanCellAccessibleClass *klass) } static void -_gtk_boolean_cell_accessible_init (GtkBooleanCellAccessible *cell) +gtk_boolean_cell_accessible_init (GtkBooleanCellAccessible *cell) { cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell, GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h index f711fed6d8..7af88edef5 100644 --- a/gtk/a11y/gtkbooleancellaccessible.h +++ b/gtk/a11y/gtkbooleancellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE (_gtk_boolean_cell_accessible_get_type ()) +#define GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE (gtk_boolean_cell_accessible_get_type ()) #define GTK_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE, GtkBooleanCellAccessible)) #define GTK_BOOLEAN_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_BOOLEAN_CELL, GtkBooleanCellAccessibleClass)) #define GTK_IS_BOOLEAN_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkBooleanCellAccessibleClass GtkRendererCellAccessibleClass parent_class; }; -GType _gtk_boolean_cell_accessible_get_type (void); +GType gtk_boolean_cell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c index d0b9d16910..6619916335 100644 --- a/gtk/a11y/gtkbuttonaccessible.c +++ b/gtk/a11y/gtkbuttonaccessible.c @@ -25,7 +25,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, _gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) @@ -55,7 +55,7 @@ gtk_button_accessible_initialize (AtkObject *obj, { GtkWidget *parent; - ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "state-flags-changed", G_CALLBACK (state_changed_cb), NULL); @@ -143,7 +143,7 @@ gtk_button_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -190,7 +190,7 @@ gtk_button_accessible_ref_state_set (AtkObject *obj) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_button_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (gtk_button_accessible_parent_class)->ref_state_set (obj); if ((gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_ACTIVE) != 0) atk_state_set_add_state (state_set, ATK_STATE_ARMED); @@ -216,11 +216,11 @@ gtk_button_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible-data-changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_button_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) +gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; @@ -239,7 +239,7 @@ _gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass) } static void -_gtk_button_accessible_init (GtkButtonAccessible *button) +gtk_button_accessible_init (GtkButtonAccessible *button) { } diff --git a/gtk/a11y/gtkbuttonaccessible.h b/gtk/a11y/gtkbuttonaccessible.h index dd6474c59d..597b415940 100644 --- a/gtk/a11y/gtkbuttonaccessible.h +++ b/gtk/a11y/gtkbuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_BUTTON_ACCESSIBLE (_gtk_button_accessible_get_type ()) +#define GTK_TYPE_BUTTON_ACCESSIBLE (gtk_button_accessible_get_type ()) #define GTK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessible)) #define GTK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON_ACCESSIBLE, GtkButtonAccessibleClass)) #define GTK_IS_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkButtonAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_button_accessible_get_type (void); +GType gtk_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcellaccessible.c b/gtk/a11y/gtkcellaccessible.c index 46c5686459..0bf68b5dec 100644 --- a/gtk/a11y/gtkcellaccessible.c +++ b/gtk/a11y/gtkcellaccessible.c @@ -19,7 +19,7 @@ #include <gtk/gtk.h> #include "gtkcontainercellaccessible.h" -#include "gtkcellaccessible.h" +#include "gtkcellaccessibleprivate.h" #include "gtkcellaccessibleparent.h" static const struct { @@ -37,10 +37,11 @@ static const struct { { ATK_STATE_EXPANDED, GTK_CELL_RENDERER_EXPANDED, FALSE }, }; +static GtkCellRendererState gtk_cell_accessible_get_state (GtkCellAccessible *cell); static void atk_action_interface_init (AtkActionIface *iface); static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, GTK_TYPE_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, gtk_cell_accessible, GTK_TYPE_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) @@ -70,7 +71,7 @@ gtk_cell_accessible_object_finalize (GObject *obj) } g_object_unref (relation_set); } - G_OBJECT_CLASS (_gtk_cell_accessible_parent_class)->finalize (obj); + G_OBJECT_CLASS (gtk_cell_accessible_parent_class)->finalize (obj); } static gint @@ -83,13 +84,13 @@ gtk_cell_accessible_get_index_in_parent (AtkObject *obj) parent = atk_object_get_parent (obj); if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent)) - return g_list_index (_gtk_container_cell_accessible_get_children (GTK_CONTAINER_CELL_ACCESSIBLE (parent)), obj); + return g_list_index (gtk_container_cell_accessible_get_children (GTK_CONTAINER_CELL_ACCESSIBLE (parent)), obj); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); if (parent == NULL) return -1; - return _gtk_cell_accessible_parent_get_child_index (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); + return gtk_cell_accessible_parent_get_child_index (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); } static AtkStateSet * @@ -110,7 +111,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible) return state_set; } - flags = _gtk_cell_accessible_get_state (cell_accessible); + flags = gtk_cell_accessible_get_state (cell_accessible); atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); @@ -139,7 +140,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible) static void -_gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass) +gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GObjectClass *g_object_class = G_OBJECT_CLASS (klass); @@ -151,12 +152,12 @@ _gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass) } static void -_gtk_cell_accessible_init (GtkCellAccessible *cell) +gtk_cell_accessible_init (GtkCellAccessible *cell) { } void -_gtk_cell_accessible_initialise (GtkCellAccessible *cell, +_gtk_cell_accessible_initialize (GtkCellAccessible *cell, GtkWidget *widget, AtkObject *parent) { @@ -286,13 +287,13 @@ gtk_cell_accessible_action_do_action (AtkAction *action, switch (index) { case 0: - _gtk_cell_accessible_parent_expand_collapse (parent, cell); + gtk_cell_accessible_parent_expand_collapse (parent, cell); break; case 1: - _gtk_cell_accessible_parent_edit (parent, cell); + gtk_cell_accessible_parent_edit (parent, cell); break; case 2: - _gtk_cell_accessible_parent_activate (parent, cell); + gtk_cell_accessible_parent_activate (parent, cell); break; default: return FALSE; @@ -325,7 +326,7 @@ gtk_cell_accessible_get_extents (AtkComponent *component, cell = GTK_CELL_ACCESSIBLE (component); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); - _gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent), + gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent), cell, x, y, width, height, coord_type); } @@ -339,7 +340,7 @@ gtk_cell_accessible_grab_focus (AtkComponent *component) cell = GTK_CELL_ACCESSIBLE (component); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))); - return _gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); + return gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); } static void @@ -349,16 +350,8 @@ atk_component_interface_init (AtkComponentIface *iface) iface->grab_focus = gtk_cell_accessible_grab_focus; } -/** - * _gtk_cell_accessible_get_state: - * @cell: a #GtkCellAccessible - * - * Gets the state that would be used to render the area referenced by @cell. - * - * Returns: the #GtkCellRendererState for cell - **/ -GtkCellRendererState -_gtk_cell_accessible_get_state (GtkCellAccessible *cell) +static GtkCellRendererState +gtk_cell_accessible_get_state (GtkCellAccessible *cell) { AtkObject *parent; @@ -368,11 +361,11 @@ _gtk_cell_accessible_get_state (GtkCellAccessible *cell) if (parent == NULL) return 0; - return _gtk_cell_accessible_parent_get_renderer_state (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); + return gtk_cell_accessible_parent_get_renderer_state (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); } -/** - * _gtk_cell_accessible_state_changed: +/* + * gtk_cell_accessible_state_changed: * @cell: a #GtkCellAccessible * @added: the flags that were added from @cell * @removed: the flags that were removed from @cell @@ -397,18 +390,18 @@ _gtk_cell_accessible_state_changed (GtkCellAccessible *cell, for (i = 0; i < G_N_ELEMENTS (state_map); i++) { if (added & state_map[i].renderer_state) - atk_object_notify_state_change (object, + atk_object_notify_state_change (object, state_map[i].atk_state, !state_map[i].invert); if (added & state_map[i].renderer_state) - atk_object_notify_state_change (object, + atk_object_notify_state_change (object, state_map[i].atk_state, state_map[i].invert); } } -/** - * _gtk_cell_accessible_update_cache: +/* + * gtk_cell_accessible_update_cache: * @cell: the cell that is changed * * Notifies the cell that the values in the data in the row that @@ -416,7 +409,7 @@ _gtk_cell_accessible_state_changed (GtkCellAccessible *cell, * cell_changed function of @cell is called to send update * notifications for the properties it takes from its cell * renderer. - * + * * Note that there is no higher granularity available about which * properties changed, so you will need to make do with this * function. @@ -425,7 +418,7 @@ void _gtk_cell_accessible_update_cache (GtkCellAccessible *cell) { GtkCellAccessibleClass *klass; - + g_return_if_fail (GTK_CELL_ACCESSIBLE (cell)); klass = GTK_CELL_ACCESSIBLE_GET_CLASS (cell); @@ -433,4 +426,3 @@ _gtk_cell_accessible_update_cache (GtkCellAccessible *cell) if (klass->update_cache) klass->update_cache (cell); } - diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h index 9419fc2120..ecb28afb4d 100644 --- a/gtk/a11y/gtkcellaccessible.h +++ b/gtk/a11y/gtkcellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CELL_ACCESSIBLE (_gtk_cell_accessible_get_type ()) +#define GTK_TYPE_CELL_ACCESSIBLE (gtk_cell_accessible_get_type ()) #define GTK_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessible)) #define GTK_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_ACCESSIBLE, GtkCellAccessibleClass)) #define GTK_IS_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE)) @@ -47,24 +47,7 @@ struct _GtkCellAccessibleClass void (*update_cache) (GtkCellAccessible *cell); }; -GType _gtk_cell_accessible_get_type (void); - -GtkCellRendererState - _gtk_cell_accessible_get_state (GtkCellAccessible *cell); -void _gtk_cell_accessible_state_changed (GtkCellAccessible *cell, - GtkCellRendererState added, - GtkCellRendererState removed); -void _gtk_cell_accessible_update_cache (GtkCellAccessible *cell); - -void _gtk_cell_accessible_initialise (GtkCellAccessible *cell, - GtkWidget *widget, - AtkObject *parent); -gboolean _gtk_cell_accessible_add_state (GtkCellAccessible *cell, - AtkStateType state_type, - gboolean emit_signal); -gboolean _gtk_cell_accessible_remove_state (GtkCellAccessible *cell, - AtkStateType state_type, - gboolean emit_signal); +GType gtk_cell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcellaccessibleparent.c b/gtk/a11y/gtkcellaccessibleparent.c index c5b24b9d1f..95ce224ddf 100644 --- a/gtk/a11y/gtkcellaccessibleparent.c +++ b/gtk/a11y/gtkcellaccessibleparent.c @@ -22,7 +22,7 @@ #include "gtkcellaccessibleparent.h" GType -_gtk_cell_accessible_parent_get_type (void) +gtk_cell_accessible_parent_get_type (void) { static volatile gsize g_define_type_id__volatile = 0; @@ -44,13 +44,13 @@ _gtk_cell_accessible_parent_get_type (void) } void -_gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type) +gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type) { GtkCellAccessibleParentIface *iface; @@ -63,9 +63,9 @@ _gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, } void -_gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - GdkRectangle *cell_rect) +gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell, + GdkRectangle *cell_rect) { GtkCellAccessibleParentIface *iface; @@ -79,8 +79,8 @@ _gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, } gboolean -_gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; @@ -95,8 +95,8 @@ _gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, } int -_gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; @@ -111,8 +111,8 @@ _gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, } GtkCellRendererState -_gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; @@ -128,8 +128,8 @@ _gtk_cell_accessible_parent_get_renderer_state (GtkCellAccessibleParent *parent, } void -_gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; @@ -143,8 +143,8 @@ _gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, } void -_gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; @@ -158,8 +158,8 @@ _gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, } void -_gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell) +gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell) { GtkCellAccessibleParentIface *iface; diff --git a/gtk/a11y/gtkcellaccessibleparent.h b/gtk/a11y/gtkcellaccessibleparent.h index f9f0a04ec2..5c0c08be8d 100644 --- a/gtk/a11y/gtkcellaccessibleparent.h +++ b/gtk/a11y/gtkcellaccessibleparent.h @@ -33,7 +33,7 @@ G_BEGIN_DECLS * implement atk_component_get_extents(). */ -#define GTK_TYPE_CELL_ACCESSIBLE_PARENT (_gtk_cell_accessible_parent_get_type ()) +#define GTK_TYPE_CELL_ACCESSIBLE_PARENT (gtk_cell_accessible_parent_get_type ()) #define GTK_IS_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT) #define GTK_CELL_ACCESSIBLE_PARENT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParent) #define GTK_CELL_ACCESSIBLE_PARENT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_ACCESSIBLE_PARENT, GtkCellAccessibleParentIface)) @@ -70,31 +70,31 @@ struct _GtkCellAccessibleParentIface GtkCellAccessible *cell); }; -GType _gtk_cell_accessible_parent_get_type (void); +GType gtk_cell_accessible_parent_get_type (void); -void _gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type); -void _gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell, - GdkRectangle *cell_rect); -gboolean _gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell); -int _gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell); +void gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell, + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type); +void gtk_cell_accessible_parent_get_cell_area (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell, + GdkRectangle *cell_rect); +gboolean gtk_cell_accessible_parent_grab_focus (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); +int gtk_cell_accessible_parent_get_child_index (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); GtkCellRendererState - _gtk_cell_accessible_parent_get_renderer_state(GtkCellAccessibleParent *parent, - GtkCellAccessible *cell); -void _gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell); -void _gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, - GtkCellAccessible *cell); -void _gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent, + gtk_cell_accessible_parent_get_renderer_state(GtkCellAccessibleParent *parent, GtkCellAccessible *cell); +void gtk_cell_accessible_parent_expand_collapse (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); +void gtk_cell_accessible_parent_activate (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); +void gtk_cell_accessible_parent_edit (GtkCellAccessibleParent *parent, + GtkCellAccessible *cell); G_END_DECLS diff --git a/gtk/a11y/gtkcellaccessibleprivate.h b/gtk/a11y/gtkcellaccessibleprivate.h new file mode 100644 index 0000000000..0519f7b5f7 --- /dev/null +++ b/gtk/a11y/gtkcellaccessibleprivate.h @@ -0,0 +1,41 @@ +/* GAIL - The GNOME Accessibility Implementation Library + * Copyright 2001 Sun Microsystems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_CELL_ACCESSIBLE_PRIVATE_H__ +#define __GTK_CELL_ACCESSIBLE_PRIVATE_H__ + +#include "gtkcellaccessible.h" + +G_BEGIN_DECLS + +void _gtk_cell_accessible_state_changed (GtkCellAccessible *cell, + GtkCellRendererState added, + GtkCellRendererState removed); +void _gtk_cell_accessible_update_cache (GtkCellAccessible *cell); +void _gtk_cell_accessible_initialize (GtkCellAccessible *cell, + GtkWidget *widget, + AtkObject *parent); +gboolean _gtk_cell_accessible_add_state (GtkCellAccessible *cell, + AtkStateType state_type, + gboolean emit_signal); +gboolean _gtk_cell_accessible_remove_state (GtkCellAccessible *cell, + AtkStateType state_type, + gboolean emit_signal); + +G_END_DECLS + +#endif /* __GTK_CELL_ACCESSIBLE_PRIVATE_H__ */ diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.c b/gtk/a11y/gtkcheckmenuitemaccessible.c index 085a18b106..4fb26e4a96 100644 --- a/gtk/a11y/gtkcheckmenuitemaccessible.c +++ b/gtk/a11y/gtkcheckmenuitemaccessible.c @@ -22,7 +22,7 @@ #include "gtkcheckmenuitemaccessible.h" -G_DEFINE_TYPE (GtkCheckMenuItemAccessible, _gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkCheckMenuItemAccessible, gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) static void toggled_cb (GtkWidget *widget) @@ -42,7 +42,7 @@ static void gtk_check_menu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); @@ -60,7 +60,7 @@ gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); check_menu_item = GTK_CHECK_MENU_ITEM (widget); @@ -78,7 +78,7 @@ gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible) static void gtk_check_menu_item_accessible_notify_gtk (GObject *obj, - GParamSpec *pspec) + GParamSpec *pspec) { GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj); AtkObject *atk_obj; @@ -101,11 +101,11 @@ gtk_check_menu_item_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) +gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -117,6 +117,6 @@ _gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *kla } static void -_gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) +gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) { } diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h index f84ede06ad..e6c663a047 100644 --- a/gtk/a11y/gtkcheckmenuitemaccessible.h +++ b/gtk/a11y/gtkcheckmenuitemaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (_gtk_check_menu_item_accessible_get_type ()) +#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (gtk_check_menu_item_accessible_get_type ()) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessible)) #define GTK_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass)) #define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkCheckMenuItemAccessibleClass GtkMenuItemAccessibleClass parent_class; }; -GType _gtk_check_menu_item_accessible_get_type (void); +GType gtk_check_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcomboboxaccessible.c b/gtk/a11y/gtkcomboboxaccessible.c index 59c6c80074..180a84a9be 100644 --- a/gtk/a11y/gtkcomboboxaccessible.c +++ b/gtk/a11y/gtkcomboboxaccessible.c @@ -30,7 +30,7 @@ struct _GtkComboBoxAccessiblePrivate static void atk_action_interface_init (AtkActionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, _gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) @@ -63,7 +63,7 @@ gtk_combo_box_accessible_initialize (AtkObject *obj, GtkComboBoxAccessible *accessible; AtkObject *popup; - ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->initialize (obj, data); combo_box = GTK_COMBO_BOX (data); accessible = GTK_COMBO_BOX_ACCESSIBLE (obj); @@ -90,7 +90,7 @@ gtk_combo_box_accessible_finalize (GObject *object) g_free (combo_box->priv->name); - G_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->finalize (object); } static const gchar * @@ -105,7 +105,7 @@ gtk_combo_box_accessible_get_name (AtkObject *obj) gint n_columns; gint i; - name = ATK_OBJECT_CLASS (_gtk_combo_box_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->get_name (obj); if (name) return name; @@ -190,7 +190,7 @@ gtk_combo_box_accessible_ref_child (AtkObject *obj, } static void -_gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) +gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -206,7 +206,7 @@ _gtk_combo_box_accessible_class_init (GtkComboBoxAccessibleClass *klass) } static void -_gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box) +gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box) { combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, GTK_TYPE_COMBO_BOX_ACCESSIBLE, diff --git a/gtk/a11y/gtkcomboboxaccessible.h b/gtk/a11y/gtkcomboboxaccessible.h index bc0f398b98..71662d897c 100644 --- a/gtk/a11y/gtkcomboboxaccessible.h +++ b/gtk/a11y/gtkcomboboxaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_COMBO_BOX_ACCESSIBLE (_gtk_combo_box_accessible_get_type ()) +#define GTK_TYPE_COMBO_BOX_ACCESSIBLE (gtk_combo_box_accessible_get_type ()) #define GTK_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessible)) #define GTK_COMBO_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COMBO_BOX_ACCESSIBLE, GtkComboBoxAccessibleClass)) #define GTK_IS_COMBO_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COMBO_BOX_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkComboBoxAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_combo_box_accessible_get_type (void); +GType gtk_combo_box_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcontaineraccessible.c b/gtk/a11y/gtkcontaineraccessible.c index 6f32898c6a..0536282489 100644 --- a/gtk/a11y/gtkcontaineraccessible.c +++ b/gtk/a11y/gtkcontaineraccessible.c @@ -25,7 +25,7 @@ struct _GtkContainerAccessiblePrivate GList *children; }; -G_DEFINE_TYPE (GtkContainerAccessible, _gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE) +G_DEFINE_TYPE (GtkContainerAccessible, gtk_container_accessible, GTK_TYPE_WIDGET_ACCESSIBLE) static gint gtk_container_accessible_get_n_children (AtkObject* obj) @@ -159,7 +159,7 @@ gtk_container_accessible_real_initialize (AtkObject *obj, { GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (obj); - ATK_OBJECT_CLASS (_gtk_container_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_container_accessible_parent_class)->initialize (obj, data); accessible->priv->children = gtk_container_get_children (GTK_CONTAINER (data)); @@ -176,11 +176,11 @@ gtk_container_accessible_finalize (GObject *object) g_list_free (accessible->priv->children); - G_OBJECT_CLASS (_gtk_container_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_container_accessible_parent_class)->finalize (object); } static void -_gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) +gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -198,7 +198,7 @@ _gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass) } static void -_gtk_container_accessible_init (GtkContainerAccessible *container) +gtk_container_accessible_init (GtkContainerAccessible *container) { container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container, GTK_TYPE_CONTAINER_ACCESSIBLE, diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h index 394c9cc72c..5ecc4950b5 100644 --- a/gtk/a11y/gtkcontaineraccessible.h +++ b/gtk/a11y/gtkcontaineraccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CONTAINER_ACCESSIBLE (_gtk_container_accessible_get_type ()) +#define GTK_TYPE_CONTAINER_ACCESSIBLE (gtk_container_accessible_get_type ()) #define GTK_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessible)) #define GTK_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass)) #define GTK_IS_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE)) @@ -53,7 +53,7 @@ struct _GtkContainerAccessibleClass gpointer data); }; -GType _gtk_container_accessible_get_type (void); +GType gtk_container_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkcontainercellaccessible.c b/gtk/a11y/gtkcontainercellaccessible.c index 9e360a48db..5a6607b7de 100644 --- a/gtk/a11y/gtkcontainercellaccessible.c +++ b/gtk/a11y/gtkcontainercellaccessible.c @@ -19,6 +19,7 @@ #include <gtk/gtk.h> #include "gtkcontainercellaccessible.h" +#include "gtkcellaccessibleprivate.h" struct _GtkContainerCellAccessiblePrivate { @@ -26,7 +27,7 @@ struct _GtkContainerCellAccessiblePrivate gint n_children; }; -G_DEFINE_TYPE (GtkContainerCellAccessible, _gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) +G_DEFINE_TYPE (GtkContainerCellAccessible, gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) static void @@ -36,7 +37,7 @@ gtk_container_cell_accessible_finalize (GObject *obj) g_list_free_full (container->priv->children, g_object_unref); - G_OBJECT_CLASS (_gtk_container_cell_accessible_parent_class)->finalize (obj); + G_OBJECT_CLASS (gtk_container_cell_accessible_parent_class)->finalize (obj); } @@ -69,9 +70,7 @@ gtk_container_cell_accessible_update_cache (GtkCellAccessible *cell) GList *l; for (l = container->priv->children; l; l = l->next) - { - _gtk_cell_accessible_update_cache (l->data); - } + _gtk_cell_accessible_update_cache (l->data); } static void @@ -81,11 +80,9 @@ gtk_container_cell_widget_set (GtkAccessible *accessible) GList *l; for (l = container->priv->children; l; l = l->next) - { - gtk_accessible_set_widget (l->data, gtk_accessible_get_widget (accessible)); - } + gtk_accessible_set_widget (l->data, gtk_accessible_get_widget (accessible)); - GTK_ACCESSIBLE_CLASS (_gtk_container_cell_accessible_parent_class)->widget_unset (accessible); + GTK_ACCESSIBLE_CLASS (gtk_container_cell_accessible_parent_class)->widget_unset (accessible); } static void @@ -95,15 +92,13 @@ gtk_container_cell_widget_unset (GtkAccessible *accessible) GList *l; for (l = container->priv->children; l; l = l->next) - { - gtk_accessible_set_widget (l->data, NULL); - } + gtk_accessible_set_widget (l->data, NULL); - GTK_ACCESSIBLE_CLASS (_gtk_container_cell_accessible_parent_class)->widget_unset (accessible); + GTK_ACCESSIBLE_CLASS (gtk_container_cell_accessible_parent_class)->widget_unset (accessible); } static void -_gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klass) +gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klass) { GtkCellAccessibleClass *cell_class = GTK_CELL_ACCESSIBLE_CLASS (klass); GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass); @@ -124,7 +119,7 @@ _gtk_container_cell_accessible_class_init (GtkContainerCellAccessibleClass *klas } static void -_gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell) +gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell) { cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell, GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, @@ -132,7 +127,7 @@ _gtk_container_cell_accessible_init (GtkContainerCellAccessible *cell) } GtkContainerCellAccessible * -_gtk_container_cell_accessible_new (void) +gtk_container_cell_accessible_new (void) { GObject *object; @@ -144,7 +139,7 @@ _gtk_container_cell_accessible_new (void) } void -_gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, +gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, GtkCellAccessible *child) { g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container)); @@ -156,7 +151,7 @@ _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, } void -_gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, +gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, GtkCellAccessible *child) { g_return_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container)); @@ -168,7 +163,7 @@ _gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *contain } GList * -_gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container) +gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container) { g_return_val_if_fail (GTK_IS_CONTAINER_CELL_ACCESSIBLE (container), NULL); diff --git a/gtk/a11y/gtkcontainercellaccessible.h b/gtk/a11y/gtkcontainercellaccessible.h index 479fcb1abe..36e40eed74 100644 --- a/gtk/a11y/gtkcontainercellaccessible.h +++ b/gtk/a11y/gtkcontainercellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_CONTAINER_CELL_ACCESSIBLE (_gtk_container_cell_accessible_get_type ()) +#define GTK_TYPE_CONTAINER_CELL_ACCESSIBLE (gtk_container_cell_accessible_get_type ()) #define GTK_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessible)) #define GTK_CONTAINER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE, GtkContainerCellAccessibleClass)) #define GTK_IS_CONTAINER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_CELL_ACCESSIBLE)) @@ -46,14 +46,14 @@ struct _GtkContainerCellAccessibleClass GtkCellAccessibleClass parent_class; }; -GType _gtk_container_cell_accessible_get_type (void); +GType gtk_container_cell_accessible_get_type (void); -GtkContainerCellAccessible *_gtk_container_cell_accessible_new (void); -void _gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, - GtkCellAccessible *child); -void _gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, - GtkCellAccessible *child); -GList *_gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container); +GtkContainerCellAccessible *gtk_container_cell_accessible_new (void); +void gtk_container_cell_accessible_add_child (GtkContainerCellAccessible *container, + GtkCellAccessible *child); +void gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *container, + GtkCellAccessible *child); +GList *gtk_container_cell_accessible_get_children (GtkContainerCellAccessible *container); G_END_DECLS diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c index 44280b64a8..809251807d 100644 --- a/gtk/a11y/gtkentryaccessible.c +++ b/gtk/a11y/gtkentryaccessible.c @@ -24,7 +24,7 @@ #include "gtkentryprivate.h" #include "gtkcomboboxaccessible.h" -#define GTK_TYPE_ENTRY_ICON_ACCESSIBLE (_gtk_entry_icon_accessible_get_type ()) +#define GTK_TYPE_ENTRY_ICON_ACCESSIBLE (gtk_entry_icon_accessible_get_type ()) #define GTK_ENTRY_ICON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ICON_ACCESSIBLE, GtkEntryIconAccessible)) #define GTK_IS_ENTRY_ICON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ICON_ACCESSIBLE)) @@ -56,9 +56,9 @@ static void atk_action_interface_init (AtkActionIface *iface); static void icon_atk_action_interface_init (AtkActionIface *iface); static void icon_atk_component_interface_init (AtkComponentIface *iface); -GType _gtk_entry_icon_accessible_get_type (void); +GType gtk_entry_icon_accessible_get_type (void); -G_DEFINE_TYPE_WITH_CODE (GtkEntryIconAccessible, _gtk_entry_icon_accessible, ATK_TYPE_OBJECT, +G_DEFINE_TYPE_WITH_CODE (GtkEntryIconAccessible, gtk_entry_icon_accessible, ATK_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, icon_atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, icon_atk_component_interface_init)) @@ -82,7 +82,7 @@ gtk_entry_icon_accessible_new (GtkEntryAccessible *entry, GtkEntryIconAccessible *icon; AtkObject *accessible; - icon = g_object_new (_gtk_entry_icon_accessible_get_type (), NULL); + icon = g_object_new (gtk_entry_icon_accessible_get_type (), NULL); icon->entry = entry; g_object_weak_ref (G_OBJECT (entry), gtk_entry_icon_accessible_remove_entry, @@ -95,7 +95,7 @@ gtk_entry_icon_accessible_new (GtkEntryAccessible *entry, } static void -_gtk_entry_icon_accessible_init (GtkEntryIconAccessible *icon) +gtk_entry_icon_accessible_init (GtkEntryIconAccessible *icon) { } @@ -109,7 +109,7 @@ gtk_entry_icon_accessible_initialize (AtkObject *obj, const gchar *name; gchar *text; - ATK_OBJECT_CLASS (_gtk_entry_icon_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_entry_icon_accessible_parent_class)->initialize (obj, data); atk_object_set_role (obj, ATK_ROLE_ICON); name = gtk_entry_get_icon_name (gtk_entry, icon->pos); @@ -196,11 +196,11 @@ gtk_entry_icon_accessible_finalize (GObject *object) gtk_entry_icon_accessible_invalidate (icon); - G_OBJECT_CLASS (_gtk_entry_icon_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_entry_icon_accessible_parent_class)->finalize (object); } static void -_gtk_entry_icon_accessible_class_init (GtkEntryIconAccessibleClass *klass) +gtk_entry_icon_accessible_class_init (GtkEntryIconAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -381,7 +381,7 @@ static void atk_text_interface_init (AtkTextIface *iface); static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, _gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkEntryAccessible, gtk_entry_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) @@ -398,7 +398,7 @@ gtk_entry_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->ref_state_set (accessible); g_object_get (G_OBJECT (widget), "editable", &value, NULL); if (value) @@ -416,7 +416,7 @@ gtk_entry_accessible_get_attributes (AtkObject *accessible) AtkAttribute *placeholder_text; const gchar *text; - attributes = ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_attributes (accessible); + attributes = ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_attributes (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -443,7 +443,7 @@ gtk_entry_accessible_initialize (AtkObject *obj, GtkEntryAccessible *gtk_entry_accessible; gint start_pos, end_pos; - ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->initialize (obj, data); gtk_entry_accessible = GTK_ENTRY_ACCESSIBLE (obj); @@ -625,7 +625,7 @@ gtk_entry_accessible_notify_gtk (GObject *obj, } } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_entry_accessible_parent_class)->notify_gtk (obj, pspec); } static gint @@ -639,7 +639,7 @@ gtk_entry_accessible_get_index_in_parent (AtkObject *accessible) if (GTK_IS_COMBO_BOX_ACCESSIBLE (accessible->accessible_parent)) return 1; - return ATK_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_index_in_parent (accessible); } static gint @@ -713,11 +713,11 @@ gtk_entry_accessible_finalize (GObject *object) g_clear_object (&priv->icons[GTK_ENTRY_ICON_PRIMARY]); g_clear_object (&priv->icons[GTK_ENTRY_ICON_SECONDARY]); - G_OBJECT_CLASS (_gtk_entry_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_entry_accessible_parent_class)->finalize (object); } static void -_gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) +gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -738,7 +738,7 @@ _gtk_entry_accessible_class_init (GtkEntryAccessibleClass *klass) } static void -_gtk_entry_accessible_init (GtkEntryAccessible *entry) +gtk_entry_accessible_init (GtkEntryAccessible *entry) { entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, GTK_TYPE_ENTRY_ACCESSIBLE, diff --git a/gtk/a11y/gtkentryaccessible.h b/gtk/a11y/gtkentryaccessible.h index 1883cc5a9c..17cdf73f4d 100644 --- a/gtk/a11y/gtkentryaccessible.h +++ b/gtk/a11y/gtkentryaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_ENTRY_ACCESSIBLE (_gtk_entry_accessible_get_type ()) +#define GTK_TYPE_ENTRY_ACCESSIBLE (gtk_entry_accessible_get_type ()) #define GTK_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessible)) #define GTK_ENTRY_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_ACCESSIBLE, GtkEntryAccessibleClass)) #define GTK_IS_ENTRY_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkEntryAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_entry_accessible_get_type (void); +GType gtk_entry_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkexpanderaccessible.c b/gtk/a11y/gtkexpanderaccessible.c index 9cd6a0ec73..c1018c5c24 100644 --- a/gtk/a11y/gtkexpanderaccessible.c +++ b/gtk/a11y/gtkexpanderaccessible.c @@ -22,7 +22,7 @@ static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, _gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static const gchar * @@ -48,7 +48,7 @@ gtk_expander_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -129,7 +129,7 @@ static void gtk_expander_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_TOGGLE_BUTTON; } @@ -159,7 +159,7 @@ gtk_expander_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible-data-changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_expander_accessible_parent_class)->notify_gtk (obj, pspec); } static AtkStateSet * @@ -173,7 +173,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_expander_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (gtk_expander_accessible_parent_class)->ref_state_set (obj); expander = GTK_EXPANDER (widget); @@ -189,7 +189,7 @@ gtk_expander_accessible_ref_state_set (AtkObject *obj) } static void -_gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) +gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -205,7 +205,7 @@ _gtk_expander_accessible_class_init (GtkExpanderAccessibleClass *klass) } static void -_gtk_expander_accessible_init (GtkExpanderAccessible *expander) +gtk_expander_accessible_init (GtkExpanderAccessible *expander) { } diff --git a/gtk/a11y/gtkexpanderaccessible.h b/gtk/a11y/gtkexpanderaccessible.h index 4b682d2fd9..2a62c60806 100644 --- a/gtk/a11y/gtkexpanderaccessible.h +++ b/gtk/a11y/gtkexpanderaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_EXPANDER_ACCESSIBLE (_gtk_expander_accessible_get_type ()) +#define GTK_TYPE_EXPANDER_ACCESSIBLE (gtk_expander_accessible_get_type ()) #define GTK_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessible)) #define GTK_EXPANDER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_EXPANDER_ACCESSIBLE, GtkExpanderAccessibleClass)) #define GTK_IS_EXPANDER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EXPANDER_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkExpanderAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_expander_accessible_get_type (void); +GType gtk_expander_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkframeaccessible.c b/gtk/a11y/gtkframeaccessible.c index f249e2697b..cc60c2cd9d 100644 --- a/gtk/a11y/gtkframeaccessible.c +++ b/gtk/a11y/gtkframeaccessible.c @@ -22,13 +22,13 @@ #include "gtkframeaccessible.h" -G_DEFINE_TYPE (GtkFrameAccessible, _gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkFrameAccessible, gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void gtk_frame_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_PANEL; } @@ -43,7 +43,7 @@ gtk_frame_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_frame_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_frame_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -51,7 +51,7 @@ gtk_frame_accessible_get_name (AtkObject *obj) } static void -_gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) +gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -60,6 +60,6 @@ _gtk_frame_accessible_class_init (GtkFrameAccessibleClass *klass) } static void -_gtk_frame_accessible_init (GtkFrameAccessible *frame) +gtk_frame_accessible_init (GtkFrameAccessible *frame) { } diff --git a/gtk/a11y/gtkframeaccessible.h b/gtk/a11y/gtkframeaccessible.h index cfcd0f157b..b6a011a36a 100644 --- a/gtk/a11y/gtkframeaccessible.h +++ b/gtk/a11y/gtkframeaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_FRAME_ACCESSIBLE (_gtk_frame_accessible_get_type ()) +#define GTK_TYPE_FRAME_ACCESSIBLE (gtk_frame_accessible_get_type ()) #define GTK_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessible)) #define GTK_FRAME_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FRAME_ACCESSIBLE, GtkFrameAccessibleClass)) #define GTK_IS_FRAME_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FRAME_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkFrameAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_frame_accessible_get_type (void); +GType gtk_frame_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c index dbd0c625b1..bf8111fe9f 100644 --- a/gtk/a11y/gtkiconviewaccessible.c +++ b/gtk/a11y/gtkiconviewaccessible.c @@ -17,7 +17,7 @@ #include "config.h" -#include "gtkiconviewaccessible.h" +#include "gtkiconviewaccessibleprivate.h" #include <string.h> @@ -754,7 +754,7 @@ _gtk_icon_view_item_accessible_init (GtkIconViewItemAccessible *item) } static void -gtk_icon_view_item_accessible_finalize (GObject *object) +_gtk_icon_view_item_accessible_finalize (GObject *object) { GtkIconViewItemAccessible *item; @@ -781,7 +781,7 @@ gtk_icon_view_item_accessible_finalize (GObject *object) } static AtkObject* -gtk_icon_view_item_accessible_get_parent (AtkObject *obj) +_gtk_icon_view_item_accessible_get_parent (AtkObject *obj) { GtkIconViewItemAccessible *item; @@ -795,7 +795,7 @@ gtk_icon_view_item_accessible_get_parent (AtkObject *obj) } static gint -gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj) +_gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj) { GtkIconViewItemAccessible *item; @@ -806,7 +806,7 @@ gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj) } static AtkStateSet * -gtk_icon_view_item_accessible_ref_state_set (AtkObject *obj) +_gtk_icon_view_item_accessible_ref_state_set (AtkObject *obj) { GtkIconViewItemAccessible *item; GtkIconView *icon_view; @@ -839,17 +839,17 @@ _gtk_icon_view_item_accessible_class_init (GtkIconViewItemAccessibleClass *klass gobject_class = (GObjectClass *)klass; atk_class = (AtkObjectClass *)klass; - gobject_class->finalize = gtk_icon_view_item_accessible_finalize; + gobject_class->finalize = _gtk_icon_view_item_accessible_finalize; - atk_class->get_index_in_parent = gtk_icon_view_item_accessible_get_index_in_parent; - atk_class->get_parent = gtk_icon_view_item_accessible_get_parent; - atk_class->ref_state_set = gtk_icon_view_item_accessible_ref_state_set; + atk_class->get_index_in_parent = _gtk_icon_view_item_accessible_get_index_in_parent; + atk_class->get_parent = _gtk_icon_view_item_accessible_get_parent; + atk_class->ref_state_set = _gtk_icon_view_item_accessible_ref_state_set; } static void atk_component_interface_init (AtkComponentIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkIconViewAccessible, _gtk_icon_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkIconViewAccessible, gtk_icon_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) @@ -1291,8 +1291,8 @@ gtk_icon_view_accessible_initialize (AtkObject *accessible, GtkIconViewAccessible *view; GtkIconView *icon_view; - if (ATK_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->initialize) - ATK_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->initialize (accessible, data); + if (ATK_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->initialize) + ATK_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->initialize (accessible, data); icon_view = (GtkIconView*)data; view = (GtkIconViewAccessible*)accessible; @@ -1317,11 +1317,11 @@ gtk_icon_view_accessible_finalize (GObject *object) gtk_icon_view_accessible_clear_cache (view); - G_OBJECT_CLASS (_gtk_icon_view_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_icon_view_accessible_parent_class)->finalize (object); } static void -_gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass) +gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass) { GObjectClass *gobject_class; AtkObjectClass *atk_class; @@ -1339,7 +1339,7 @@ _gtk_icon_view_accessible_class_init (GtkIconViewAccessibleClass *klass) } static void -_gtk_icon_view_accessible_init (GtkIconViewAccessible *accessible) +gtk_icon_view_accessible_init (GtkIconViewAccessible *accessible) { accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, GTK_TYPE_ICON_VIEW_ACCESSIBLE, diff --git a/gtk/a11y/gtkiconviewaccessible.h b/gtk/a11y/gtkiconviewaccessible.h index 11dc488017..5ccb9caf2a 100644 --- a/gtk/a11y/gtkiconviewaccessible.h +++ b/gtk/a11y/gtkiconviewaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_ICON_VIEW_ACCESSIBLE (_gtk_icon_view_accessible_get_type ()) +#define GTK_TYPE_ICON_VIEW_ACCESSIBLE (gtk_icon_view_accessible_get_type ()) #define GTK_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessible)) #define GTK_ICON_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ICON_VIEW_ACCESSIBLE, GtkIconViewAccessibleClass)) #define GTK_IS_ICON_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ICON_VIEW_ACCESSIBLE)) @@ -46,9 +46,7 @@ struct _GtkIconViewAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_icon_view_accessible_get_type (void); - -void _gtk_icon_view_accessible_adjustment_changed (GtkIconView *icon_view); +GType gtk_icon_view_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkiconviewaccessibleprivate.h b/gtk/a11y/gtkiconviewaccessibleprivate.h new file mode 100644 index 0000000000..fd7ac1a24a --- /dev/null +++ b/gtk/a11y/gtkiconviewaccessibleprivate.h @@ -0,0 +1,29 @@ +/* gtkiconview.c + * Copyright (C) 2002, 2004 Anders Carlsson <andersca@gnu.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__ +#define __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__ + +#include "gtkiconviewaccessible.h" + +G_BEGIN_DECLS + +void _gtk_icon_view_accessible_adjustment_changed (GtkIconView *icon_view); + +G_END_DECLS + +#endif /* __GTK_ICON_VIEW_ACCESSIBLE_PRIVATE_H__ */ diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c index 48fa331b32..de9f707a31 100644 --- a/gtk/a11y/gtkimageaccessible.c +++ b/gtk/a11y/gtkimageaccessible.c @@ -29,14 +29,14 @@ struct _GtkImageAccessiblePrivate static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, _gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkImageAccessible, gtk_image_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) static void gtk_image_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_ICON; } @@ -49,7 +49,7 @@ gtk_image_accessible_finalize (GObject *object) g_free (aimage->priv->image_description); g_free (aimage->priv->stock_name); - G_OBJECT_CLASS (_gtk_image_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_image_accessible_parent_class)->finalize (object); } static const gchar * @@ -66,7 +66,7 @@ gtk_image_accessible_get_name (AtkObject *accessible) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_image_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (gtk_image_accessible_parent_class)->get_name (accessible); if (name) return name; @@ -91,7 +91,7 @@ gtk_image_accessible_get_name (AtkObject *accessible) } static void -_gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) +gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -104,7 +104,7 @@ _gtk_image_accessible_class_init (GtkImageAccessibleClass *klass) } static void -_gtk_image_accessible_init (GtkImageAccessible *image) +gtk_image_accessible_init (GtkImageAccessible *image) { image->priv = G_TYPE_INSTANCE_GET_PRIVATE (image, GTK_TYPE_IMAGE_ACCESSIBLE, diff --git a/gtk/a11y/gtkimageaccessible.h b/gtk/a11y/gtkimageaccessible.h index 7e481d7227..6d4d93c471 100644 --- a/gtk/a11y/gtkimageaccessible.h +++ b/gtk/a11y/gtkimageaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_IMAGE_ACCESSIBLE (_gtk_image_accessible_get_type ()) +#define GTK_TYPE_IMAGE_ACCESSIBLE (gtk_image_accessible_get_type ()) #define GTK_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessible)) #define GTK_IMAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_ACCESSIBLE, GtkImageAccessibleClass)) #define GTK_IS_IMAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkImageAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_image_accessible_get_type (void); +GType gtk_image_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c index 705756cc4a..171377b079 100644 --- a/gtk/a11y/gtkimagecellaccessible.c +++ b/gtk/a11y/gtkimagecellaccessible.c @@ -27,7 +27,7 @@ struct _GtkImageCellAccessiblePrivate 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, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)) static void @@ -36,11 +36,11 @@ gtk_image_cell_accessible_finalize (GObject *object) GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (object); 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); } static void -_gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass) +gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -50,7 +50,7 @@ _gtk_image_cell_accessible_class_init (GtkImageCellAccessibleClass *klass) } static void -_gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell) +gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell) { image_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (image_cell, GTK_TYPE_IMAGE_CELL_ACCESSIBLE, diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h index 99862cc7ba..387283c60f 100644 --- a/gtk/a11y/gtkimagecellaccessible.h +++ b/gtk/a11y/gtkimagecellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_IMAGE_CELL_ACCESSIBLE (_gtk_image_cell_accessible_get_type ()) +#define GTK_TYPE_IMAGE_CELL_ACCESSIBLE (gtk_image_cell_accessible_get_type ()) #define GTK_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessible)) #define GTK_IMAGE_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_IMAGE_CELL_ACCESSIBLE, GtkImageCellAccessibleClass)) #define GTK_IS_IMAGE_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_CELL_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkImageCellAccessibleClass GtkRendererCellAccessibleClass parent_class; }; -GType _gtk_image_cell_accessible_get_type (void); +GType gtk_image_cell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c index 8c55c29ed5..be926585f1 100644 --- a/gtk/a11y/gtklabelaccessible.c +++ b/gtk/a11y/gtklabelaccessible.c @@ -30,11 +30,11 @@ struct _GtkLabelAccessiblePrivate static void atk_text_interface_init (AtkTextIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, _gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessible, gtk_label_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) static void -_gtk_label_accessible_init (GtkLabelAccessible *label) +gtk_label_accessible_init (GtkLabelAccessible *label) { label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label, GTK_TYPE_LABEL_ACCESSIBLE, @@ -48,7 +48,7 @@ gtk_label_accessible_initialize (AtkObject *obj, GtkWidget *widget; GtkLabelAccessible *accessible; - ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->initialize (obj, data); accessible = GTK_LABEL_ACCESSIBLE (obj); @@ -148,7 +148,7 @@ gtk_label_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "text-selection-changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_label_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_label_accessible_parent_class)->notify_gtk (obj, pspec); } static void @@ -158,7 +158,7 @@ gtk_label_accessible_finalize (GObject *object) g_free (accessible->priv->text); - G_OBJECT_CLASS (_gtk_label_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_label_accessible_parent_class)->finalize (object); } @@ -174,7 +174,7 @@ gtk_label_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_state_set (accessible); atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE); return state_set; @@ -192,7 +192,7 @@ gtk_label_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->ref_relation_set (obj); if (!atk_relation_set_contains (relation_set, ATK_RELATION_LABEL_FOR)) { @@ -251,7 +251,7 @@ gtk_label_accessible_get_name (AtkObject *accessible) g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL); - name = ATK_OBJECT_CLASS (_gtk_label_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (gtk_label_accessible_parent_class)->get_name (accessible); if (name != NULL) return name; else @@ -272,7 +272,7 @@ gtk_label_accessible_get_name (AtkObject *accessible) } static void -_gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass) +gtk_label_accessible_class_init (GtkLabelAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); diff --git a/gtk/a11y/gtklabelaccessible.h b/gtk/a11y/gtklabelaccessible.h index 5e0060b88f..f591541fc1 100644 --- a/gtk/a11y/gtklabelaccessible.h +++ b/gtk/a11y/gtklabelaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_LABEL_ACCESSIBLE (_gtk_label_accessible_get_type ()) +#define GTK_TYPE_LABEL_ACCESSIBLE (gtk_label_accessible_get_type ()) #define GTK_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessible)) #define GTK_LABEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LABEL_ACCESSIBLE, GtkLabelAccessibleClass)) #define GTK_IS_LABEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkLabelAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_label_accessible_get_type (void); +GType gtk_label_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklinkbuttonaccessible.c b/gtk/a11y/gtklinkbuttonaccessible.c index ee931b2297..359c0b11f3 100644 --- a/gtk/a11y/gtklinkbuttonaccessible.c +++ b/gtk/a11y/gtklinkbuttonaccessible.c @@ -197,11 +197,11 @@ gtk_link_button_accessible_get_hyperlink (AtkHyperlinkImpl *impl) static void atk_hypertext_impl_interface_init (AtkHyperlinkImplIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, _gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkLinkButtonAccessible, gtk_link_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_HYPERLINK_IMPL, atk_hypertext_impl_interface_init)) static void -_gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) +gtk_link_button_accessible_init (GtkLinkButtonAccessible *button) { button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, GTK_TYPE_LINK_BUTTON_ACCESSIBLE, @@ -216,11 +216,11 @@ gtk_link_button_accessible_finalize (GObject *object) if (button->priv->link) g_object_unref (button->priv->link); - G_OBJECT_CLASS (_gtk_link_button_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_link_button_accessible_parent_class)->finalize (object); } static void -_gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) +gtk_link_button_accessible_class_init (GtkLinkButtonAccessibleClass *klass) { G_OBJECT_CLASS (klass)->finalize = gtk_link_button_accessible_finalize; diff --git a/gtk/a11y/gtklinkbuttonaccessible.h b/gtk/a11y/gtklinkbuttonaccessible.h index ef7ef9ede5..762e3ae134 100644 --- a/gtk/a11y/gtklinkbuttonaccessible.h +++ b/gtk/a11y/gtklinkbuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (_gtk_link_button_accessible_get_type ()) +#define GTK_TYPE_LINK_BUTTON_ACCESSIBLE (gtk_link_button_accessible_get_type ()) #define GTK_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessible)) #define GTK_LINK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON_ACCESSIBLE, GtkLinkButtonAccessibleClass)) #define GTK_IS_LINK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkLinkButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType _gtk_link_button_accessible_get_type (void); +GType gtk_link_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklockbuttonaccessible.c b/gtk/a11y/gtklockbuttonaccessible.c index 641cfe33b8..d743fdc21a 100644 --- a/gtk/a11y/gtklockbuttonaccessible.c +++ b/gtk/a11y/gtklockbuttonaccessible.c @@ -17,12 +17,12 @@ #include "config.h" -#include "gtklockbuttonaccessible.h" +#include "gtklockbuttonaccessibleprivate.h" #include "gtk/gtklockbuttonprivate.h" #include "gtk/gtkwidgetprivate.h" -G_DEFINE_TYPE (GtkLockButtonAccessible, _gtk_lock_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) +G_DEFINE_TYPE (GtkLockButtonAccessible, gtk_lock_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) static const gchar * gtk_lock_button_accessible_get_name (AtkObject *obj) @@ -37,7 +37,7 @@ gtk_lock_button_accessible_get_name (AtkObject *obj) } static void -_gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass) +gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -45,7 +45,7 @@ _gtk_lock_button_accessible_class_init (GtkLockButtonAccessibleClass *klass) } static void -_gtk_lock_button_accessible_init (GtkLockButtonAccessible *lockbutton) +gtk_lock_button_accessible_init (GtkLockButtonAccessible *lockbutton) { } diff --git a/gtk/a11y/gtklockbuttonaccessible.h b/gtk/a11y/gtklockbuttonaccessible.h index 8997c308b1..8af23caae6 100644 --- a/gtk/a11y/gtklockbuttonaccessible.h +++ b/gtk/a11y/gtklockbuttonaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_LOCK_BUTTON_ACCESSIBLE (_gtk_lock_button_accessible_get_type ()) +#define GTK_TYPE_LOCK_BUTTON_ACCESSIBLE (gtk_lock_button_accessible_get_type ()) #define GTK_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessible)) #define GTK_LOCK_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE, GtkLockButtonAccessibleClass)) #define GTK_IS_LOCK_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LOCK_BUTTON_ACCESSIBLE)) @@ -46,10 +46,7 @@ struct _GtkLockButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType _gtk_lock_button_accessible_get_type (void); - -void _gtk_lock_button_accessible_name_changed (GtkLockButton *lockbutton); - +GType gtk_lock_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtklockbuttonaccessibleprivate.h b/gtk/a11y/gtklockbuttonaccessibleprivate.h new file mode 100644 index 0000000000..7c65bbc77a --- /dev/null +++ b/gtk/a11y/gtklockbuttonaccessibleprivate.h @@ -0,0 +1,29 @@ +/* GAIL - The GNOME Accessibility Implementation Library + * Copyright 2001 Sun Microsystems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__ +#define __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__ + +#include "gtklockbuttonaccessible.h" + +G_BEGIN_DECLS + +void _gtk_lock_button_accessible_name_changed (GtkLockButton *lockbutton); + +G_END_DECLS + +#endif /* __GTK_LOCK_BUTTON_ACCESSIBLE_PRIVATE_H__ */ diff --git a/gtk/a11y/gtkmenuaccessible.c b/gtk/a11y/gtkmenuaccessible.c index 4a07f13bf4..3935e6a0b1 100644 --- a/gtk/a11y/gtkmenuaccessible.c +++ b/gtk/a11y/gtkmenuaccessible.c @@ -18,16 +18,17 @@ #include "config.h" #include "gtkmenuaccessible.h" +#include "gtkwidgetaccessibleprivate.h" #include <gtk/gtk.h> -G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE) +G_DEFINE_TYPE (GtkMenuAccessible, gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE) static void gtk_menu_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_MENU; @@ -79,11 +80,11 @@ gtk_menu_accessible_get_index_in_parent (AtkObject *accessible) if (gtk_menu_get_attach_widget (GTK_MENU (widget))) return 0; - return ATK_OBJECT_CLASS (_gtk_menu_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (gtk_menu_accessible_parent_class)->get_index_in_parent (accessible); } static void -_gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) +gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -93,6 +94,6 @@ _gtk_menu_accessible_class_init (GtkMenuAccessibleClass *klass) } static void -_gtk_menu_accessible_init (GtkMenuAccessible *accessible) +gtk_menu_accessible_init (GtkMenuAccessible *accessible) { } diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h index 1cfe2317ac..b8fa8a7e2b 100644 --- a/gtk/a11y/gtkmenuaccessible.h +++ b/gtk/a11y/gtkmenuaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_ACCESSIBLE (_gtk_menu_accessible_get_type ()) +#define GTK_TYPE_MENU_ACCESSIBLE (gtk_menu_accessible_get_type ()) #define GTK_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessible)) #define GTK_MENU_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ACCESSIBLE, GtkMenuAccessibleClass)) #define GTK_IS_MENU_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkMenuAccessibleClass GtkMenuShellAccessibleClass parent_class; }; -GType _gtk_menu_accessible_get_type (void); +GType gtk_menu_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkmenuitemaccessible.c b/gtk/a11y/gtkmenuitemaccessible.c index 4389639572..caeabb5884 100644 --- a/gtk/a11y/gtkmenuitemaccessible.c +++ b/gtk/a11y/gtkmenuitemaccessible.c @@ -18,6 +18,7 @@ #include <string.h> #include <gtk/gtk.h> #include "gtkmenuitemaccessible.h" +#include "gtkwidgetaccessibleprivate.h" #include "gtk/gtkmenuitemprivate.h" struct _GtkMenuItemAccessiblePrivate @@ -42,7 +43,7 @@ static gint menu_item_remove_gtk (GtkContainer *container, static void atk_action_interface_init (AtkActionIface *iface); static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, _gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init); G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) @@ -54,7 +55,7 @@ gtk_menu_item_accessible_initialize (AtkObject *obj, GtkWidget *parent; GtkWidget *menu; - ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "select", G_CALLBACK (menu_item_select), NULL); g_signal_connect (data, "deselect", G_CALLBACK (menu_item_deselect), NULL); @@ -146,7 +147,7 @@ gtk_menu_item_accessible_ref_state_set (AtkObject *obj) AtkObject *menu_item; AtkStateSet *state_set, *parent_state_set; - state_set = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->ref_state_set (obj); atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); if (GTK_MENU_ITEM_ACCESSIBLE (obj)->priv->selected) @@ -181,7 +182,7 @@ gtk_menu_item_accessible_get_role (AtkObject *obj) gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget))) return ATK_ROLE_MENU; - return ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->get_role (obj); + return ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->get_role (obj); } static const gchar * @@ -196,7 +197,7 @@ gtk_menu_item_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->get_name (obj); if (name) return name; @@ -216,7 +217,7 @@ gtk_menu_item_accessible_finalize (GObject *object) g_free (accessible->priv->text); - G_OBJECT_CLASS (_gtk_menu_item_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_menu_item_accessible_parent_class)->finalize (object); } static void @@ -234,11 +235,11 @@ gtk_menu_item_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible-data-changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) +gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -259,7 +260,7 @@ _gtk_menu_item_accessible_class_init (GtkMenuItemAccessibleClass *klass) } static void -_gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) +gtk_menu_item_accessible_init (GtkMenuItemAccessible *menu_item) { menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (menu_item, GTK_TYPE_MENU_ITEM_ACCESSIBLE, @@ -833,7 +834,7 @@ menu_item_add_gtk (GtkContainer *container, parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container)); if (GTK_IS_MENU_ITEM (parent_widget)) { - GTK_CONTAINER_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->add_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); + GTK_CONTAINER_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->add_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); } return 1; @@ -850,7 +851,7 @@ menu_item_remove_gtk (GtkContainer *container, parent_widget = gtk_menu_get_attach_widget (GTK_MENU (container)); if (GTK_IS_MENU_ITEM (parent_widget)) { - GTK_CONTAINER_ACCESSIBLE_CLASS (_gtk_menu_item_accessible_parent_class)->remove_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); + GTK_CONTAINER_ACCESSIBLE_CLASS (gtk_menu_item_accessible_parent_class)->remove_gtk (container, widget, gtk_widget_get_accessible (parent_widget)); } return 1; } diff --git a/gtk/a11y/gtkmenuitemaccessible.h b/gtk/a11y/gtkmenuitemaccessible.h index a5e0eee472..b6830ffd83 100644 --- a/gtk/a11y/gtkmenuitemaccessible.h +++ b/gtk/a11y/gtkmenuitemaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_ITEM_ACCESSIBLE (_gtk_menu_item_accessible_get_type ()) +#define GTK_TYPE_MENU_ITEM_ACCESSIBLE (gtk_menu_item_accessible_get_type ()) #define GTK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessible)) #define GTK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_ITEM_ACCESSIBLE, GtkMenuItemAccessibleClass)) #define GTK_IS_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_ITEM_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkMenuItemAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_menu_item_accessible_get_type (void); +GType gtk_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkmenushellaccessible.c b/gtk/a11y/gtkmenushellaccessible.c index 1fd7d1ea1a..799d83264f 100644 --- a/gtk/a11y/gtkmenushellaccessible.c +++ b/gtk/a11y/gtkmenushellaccessible.c @@ -23,20 +23,20 @@ static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, _gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkMenuShellAccessible, gtk_menu_shell_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static void gtk_menu_shell_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_menu_shell_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_UNKNOWN; } static void -_gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) +gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -44,7 +44,7 @@ _gtk_menu_shell_accessible_class_init (GtkMenuShellAccessibleClass *klass) } static void -_gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell) +gtk_menu_shell_accessible_init (GtkMenuShellAccessible *menu_shell) { } diff --git a/gtk/a11y/gtkmenushellaccessible.h b/gtk/a11y/gtkmenushellaccessible.h index abc29200c9..d613b787b2 100644 --- a/gtk/a11y/gtkmenushellaccessible.h +++ b/gtk/a11y/gtkmenushellaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_MENU_SHELL_ACCESSIBLE (_gtk_menu_shell_accessible_get_type ()) +#define GTK_TYPE_MENU_SHELL_ACCESSIBLE (gtk_menu_shell_accessible_get_type ()) #define GTK_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessible)) #define GTK_MENU_SHELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MENU_SHELL_ACCESSIBLE, GtkMenuShellAccessibleClass)) #define GTK_IS_MENU_SHELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_MENU_SHELL_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkMenuShellAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_menu_shell_accessible_get_type (void); +GType gtk_menu_shell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtknotebookaccessible.c b/gtk/a11y/gtknotebookaccessible.c index 77b8f1fdd5..a82cbc2aff 100644 --- a/gtk/a11y/gtknotebookaccessible.c +++ b/gtk/a11y/gtknotebookaccessible.c @@ -38,7 +38,7 @@ struct _GtkNotebookAccessiblePrivate static void atk_selection_interface_init (AtkSelectionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, _gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkNotebookAccessible, gtk_notebook_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init)) static gboolean @@ -105,7 +105,7 @@ create_notebook_page_accessible (GtkNotebookAccessible *accessible, { AtkObject *obj; - obj = _gtk_notebook_page_accessible_new (accessible, child); + obj = gtk_notebook_page_accessible_new (accessible, child); g_hash_table_insert (accessible->priv->pages, child, obj); atk_object_set_parent (obj, ATK_OBJECT (accessible)); g_signal_emit_by_name (accessible, "children-changed::add", page_num, obj, NULL); @@ -140,7 +140,7 @@ page_removed_cb (GtkNotebook *notebook, g_return_if_fail (obj); g_signal_emit_by_name (accessible, "children-changed::remove", page_num, obj, NULL); - _gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); + gtk_notebook_page_accessible_invalidate (GTK_NOTEBOOK_PAGE_ACCESSIBLE (obj)); g_hash_table_remove (accessible->priv->pages, widget); } @@ -153,7 +153,7 @@ gtk_notebook_accessible_initialize (AtkObject *obj, GtkNotebook *notebook; gint i; - ATK_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->initialize (obj, data); accessible = GTK_NOTEBOOK_ACCESSIBLE (obj); notebook = GTK_NOTEBOOK (data); @@ -186,7 +186,7 @@ gtk_notebook_accessible_finalize (GObject *object) if (accessible->priv->idle_focus_id) g_source_remove (accessible->priv->idle_focus_id); - G_OBJECT_CLASS (_gtk_notebook_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->finalize (object); } static AtkObject * @@ -280,7 +280,7 @@ gtk_notebook_accessible_notify_gtk (GObject *obj, } } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_notebook_accessible_parent_class)->notify_gtk (obj, pspec); } /* @@ -305,7 +305,7 @@ gtk_notebook_accessible_add_selection (AtkSelection *selection, } static void -_gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) +gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -327,7 +327,7 @@ _gtk_notebook_accessible_class_init (GtkNotebookAccessibleClass *klass) } static void -_gtk_notebook_accessible_init (GtkNotebookAccessible *notebook) +gtk_notebook_accessible_init (GtkNotebookAccessible *notebook) { notebook->priv = G_TYPE_INSTANCE_GET_PRIVATE (notebook, GTK_TYPE_NOTEBOOK_ACCESSIBLE, diff --git a/gtk/a11y/gtknotebookaccessible.h b/gtk/a11y/gtknotebookaccessible.h index e6e10fc834..053a05e8cb 100644 --- a/gtk/a11y/gtknotebookaccessible.h +++ b/gtk/a11y/gtknotebookaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_NOTEBOOK_ACCESSIBLE (_gtk_notebook_accessible_get_type ()) +#define GTK_TYPE_NOTEBOOK_ACCESSIBLE (gtk_notebook_accessible_get_type ()) #define GTK_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessible)) #define GTK_NOTEBOOK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_ACCESSIBLE, GtkNotebookAccessibleClass)) #define GTK_IS_NOTEBOOK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkNotebookAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_notebook_accessible_get_type (void); +GType gtk_notebook_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtknotebookpageaccessible.c b/gtk/a11y/gtknotebookpageaccessible.c index 49f4797fc8..b6ec03d31e 100644 --- a/gtk/a11y/gtknotebookpageaccessible.c +++ b/gtk/a11y/gtknotebookpageaccessible.c @@ -30,7 +30,7 @@ struct _GtkNotebookPageAccessiblePrivate static void atk_component_interface_init (AtkComponentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, _gtk_notebook_page_accessible, ATK_TYPE_OBJECT, +G_DEFINE_TYPE_WITH_CODE (GtkNotebookPageAccessible, gtk_notebook_page_accessible, ATK_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) @@ -146,7 +146,7 @@ gtk_notebook_page_accessible_ref_state_set (AtkObject *accessible) GtkWidget *label; AtkObject *selected; - state_set = ATK_OBJECT_CLASS (_gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_notebook_page_accessible_parent_class)->ref_state_set (accessible); atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); @@ -203,7 +203,7 @@ gtk_notebook_page_accessible_get_index_in_parent (AtkObject *accessible) } static void -_gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) +gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -218,7 +218,7 @@ _gtk_notebook_page_accessible_class_init (GtkNotebookPageAccessibleClass *klass) } static void -_gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page) +gtk_notebook_page_accessible_init (GtkNotebookPageAccessible *page) { page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page, GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, @@ -236,8 +236,8 @@ notify_tab_label (GObject *object, } AtkObject * -_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, - GtkWidget *child) +gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, + GtkWidget *child) { GObject *object; AtkObject *atk_object; @@ -266,7 +266,7 @@ _gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, } void -_gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page) +gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page) { AtkObject *obj = ATK_OBJECT (page); GtkWidget *notebook; diff --git a/gtk/a11y/gtknotebookpageaccessible.h b/gtk/a11y/gtknotebookpageaccessible.h index 6bd454fb32..9666c6c471 100644 --- a/gtk/a11y/gtknotebookpageaccessible.h +++ b/gtk/a11y/gtknotebookpageaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (_gtk_notebook_page_accessible_get_type ()) +#define GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE (gtk_notebook_page_accessible_get_type ()) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessible)) #define GTK_NOTEBOOK_PAGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE, GtkNotebookPageAccessibleClass)) #define GTK_IS_NOTEBOOK_PAGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_NOTEBOOK_PAGE_ACCESSIBLE)) @@ -45,12 +45,12 @@ struct _GtkNotebookPageAccessibleClass AtkObjectClass parent_class; }; -GType _gtk_notebook_page_accessible_get_type (void); +GType gtk_notebook_page_accessible_get_type (void); -AtkObject *_gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, - GtkWidget *child); +AtkObject *gtk_notebook_page_accessible_new (GtkNotebookAccessible *notebook, + GtkWidget *child); -void _gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page); +void gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page); G_END_DECLS diff --git a/gtk/a11y/gtkpanedaccessible.c b/gtk/a11y/gtkpanedaccessible.c index 2d3465c4f9..bef4e46256 100644 --- a/gtk/a11y/gtkpanedaccessible.c +++ b/gtk/a11y/gtkpanedaccessible.c @@ -23,7 +23,7 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, _gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void @@ -39,7 +39,7 @@ static void gtk_paned_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_paned_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_paned_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "size-allocate", G_CALLBACK (gtk_paned_accessible_size_allocate_gtk), NULL); @@ -48,7 +48,7 @@ gtk_paned_accessible_initialize (AtkObject *obj, } static void -_gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) +gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -56,7 +56,7 @@ _gtk_paned_accessible_class_init (GtkPanedAccessibleClass *klass) } static void -_gtk_paned_accessible_init (GtkPanedAccessible *paned) +gtk_paned_accessible_init (GtkPanedAccessible *paned) { } diff --git a/gtk/a11y/gtkpanedaccessible.h b/gtk/a11y/gtkpanedaccessible.h index 598bbc705d..7720d43f08 100644 --- a/gtk/a11y/gtkpanedaccessible.h +++ b/gtk/a11y/gtkpanedaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_PANED_ACCESSIBLE (_gtk_paned_accessible_get_type ()) +#define GTK_TYPE_PANED_ACCESSIBLE (gtk_paned_accessible_get_type ()) #define GTK_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessible)) #define GTK_PANED_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PANED_ACCESSIBLE, GtkPanedAccessibleClass)) #define GTK_IS_PANED_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PANED_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkPanedAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_paned_accessible_get_type (void); +GType gtk_paned_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkprogressbaraccessible.c b/gtk/a11y/gtkprogressbaraccessible.c index d4c71f4b48..f473c38765 100644 --- a/gtk/a11y/gtkprogressbaraccessible.c +++ b/gtk/a11y/gtkprogressbaraccessible.c @@ -26,14 +26,14 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, _gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkProgressBarAccessible, gtk_progress_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void gtk_progress_bar_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_progress_bar_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_progress_bar_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_PROGRESS_BAR; } @@ -50,11 +50,11 @@ gtk_progress_bar_accessible_notify_gtk (GObject *obj, if (strcmp (pspec->name, "fraction") == 0) g_object_notify (G_OBJECT (accessible), "accessible-value"); else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_progress_bar_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) +gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -65,7 +65,7 @@ _gtk_progress_bar_accessible_class_init (GtkProgressBarAccessibleClass *klass) } static void -_gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar) +gtk_progress_bar_accessible_init (GtkProgressBarAccessible *bar) { } diff --git a/gtk/a11y/gtkprogressbaraccessible.h b/gtk/a11y/gtkprogressbaraccessible.h index 90b6006e7c..2b57cce359 100644 --- a/gtk/a11y/gtkprogressbaraccessible.h +++ b/gtk/a11y/gtkprogressbaraccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (_gtk_progress_bar_accessible_get_type ()) +#define GTK_TYPE_PROGRESS_BAR_ACCESSIBLE (gtk_progress_bar_accessible_get_type ()) #define GTK_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessible)) #define GTK_PROGRESS_BAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE, GtkProgressBarAccessibleClass)) #define GTK_IS_PROGRESS_BAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PROGRESS_BAR_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkProgressBarAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_progress_bar_accessible_get_type (void); +GType gtk_progress_bar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkradiobuttonaccessible.c b/gtk/a11y/gtkradiobuttonaccessible.c index 96cc9c7161..93736e0bb0 100644 --- a/gtk/a11y/gtkradiobuttonaccessible.c +++ b/gtk/a11y/gtkradiobuttonaccessible.c @@ -26,13 +26,13 @@ struct _GtkRadioButtonAccessiblePrivate }; -G_DEFINE_TYPE (GtkRadioButtonAccessible, _gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioButtonAccessible, gtk_radio_button_accessible, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE) static void gtk_radio_button_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_RADIO_BUTTON; } @@ -51,7 +51,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj) radio_button = GTK_RADIO_BUTTON_ACCESSIBLE (obj); - relation_set = ATK_OBJECT_CLASS (_gtk_radio_button_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (gtk_radio_button_accessible_parent_class)->ref_relation_set (obj); /* If the radio button'group has changed remove the relation */ list = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget)); @@ -103,7 +103,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj) } static void -_gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) +gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -114,7 +114,7 @@ _gtk_radio_button_accessible_class_init (GtkRadioButtonAccessibleClass *klass) } static void -_gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button) +gtk_radio_button_accessible_init (GtkRadioButtonAccessible *radio_button) { radio_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_button, GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, diff --git a/gtk/a11y/gtkradiobuttonaccessible.h b/gtk/a11y/gtkradiobuttonaccessible.h index a2603f1409..89a04f82f1 100644 --- a/gtk/a11y/gtkradiobuttonaccessible.h +++ b/gtk/a11y/gtkradiobuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (_gtk_radio_button_accessible_get_type ()) +#define GTK_TYPE_RADIO_BUTTON_ACCESSIBLE (gtk_radio_button_accessible_get_type ()) #define GTK_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessible)) #define GTK_RADIO_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE, GtkRadioButtonAccessibleClass)) #define GTK_IS_RADIO_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkRadioButtonAccessibleClass GtkToggleButtonAccessibleClass parent_class; }; -GType _gtk_radio_button_accessible_get_type (void); +GType gtk_radio_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkradiomenuitemaccessible.c b/gtk/a11y/gtkradiomenuitemaccessible.c index 4d90ee938a..e165c2c27f 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.c +++ b/gtk/a11y/gtkradiomenuitemaccessible.c @@ -25,7 +25,7 @@ struct _GtkRadioMenuItemAccessiblePrivate GSList *old_group; }; -G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioMenuItemAccessible, gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) static AtkRelationSet * @@ -42,7 +42,7 @@ gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj) radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj); - relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); /* If the radio menu_item's group has changed remove the relation */ list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); @@ -94,13 +94,13 @@ static void gtk_radio_menu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_RADIO_MENU_ITEM; } static void -_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) +gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -111,7 +111,7 @@ _gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *kla } static void -_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) +gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) { radio_menu_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (radio_menu_item, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h index ad7b1bf13b..a3cf0d18b7 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.h +++ b/gtk/a11y/gtkradiomenuitemaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (_gtk_radio_menu_item_accessible_get_type ()) +#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (gtk_radio_menu_item_accessible_get_type ()) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible)) #define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) #define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkRadioMenuItemAccessibleClass GtkCheckMenuItemAccessibleClass parent_class; }; -GType _gtk_radio_menu_item_accessible_get_type (void); +GType gtk_radio_menu_item_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkrangeaccessible.c b/gtk/a11y/gtkrangeaccessible.c index 7f4a0a7144..dc551354bf 100644 --- a/gtk/a11y/gtkrangeaccessible.c +++ b/gtk/a11y/gtkrangeaccessible.c @@ -25,7 +25,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, _gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkRangeAccessible, gtk_range_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) @@ -44,7 +44,7 @@ gtk_range_accessible_initialize (AtkObject *obj, GtkAdjustment *adj; GtkRange *gtk_range; - ATK_OBJECT_CLASS (_gtk_range_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_range_accessible_parent_class)->initialize (obj, data); gtk_range = GTK_RANGE (data); /* @@ -77,7 +77,7 @@ gtk_range_accessible_finalize (GObject *object) range); } - G_OBJECT_CLASS (_gtk_range_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_range_accessible_parent_class)->finalize (object); } static void @@ -97,12 +97,12 @@ gtk_range_accessible_notify_gtk (GObject *obj, range); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_range_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_range_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) +gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -116,7 +116,7 @@ _gtk_range_accessible_class_init (GtkRangeAccessibleClass *klass) } static void -_gtk_range_accessible_init (GtkRangeAccessible *range) +gtk_range_accessible_init (GtkRangeAccessible *range) { } diff --git a/gtk/a11y/gtkrangeaccessible.h b/gtk/a11y/gtkrangeaccessible.h index e7df6ccaed..996a152473 100644 --- a/gtk/a11y/gtkrangeaccessible.h +++ b/gtk/a11y/gtkrangeaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RANGE_ACCESSIBLE (_gtk_range_accessible_get_type ()) +#define GTK_TYPE_RANGE_ACCESSIBLE (gtk_range_accessible_get_type ()) #define GTK_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessible)) #define GTK_RANGE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RANGE_ACCESSIBLE, GtkRangeAccessibleClass)) #define GTK_IS_RANGE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RANGE_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkRangeAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_range_accessible_get_type (void); +GType gtk_range_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkrenderercellaccessible.c b/gtk/a11y/gtkrenderercellaccessible.c index 6c26897980..bec09a9a10 100644 --- a/gtk/a11y/gtkrenderercellaccessible.c +++ b/gtk/a11y/gtkrenderercellaccessible.c @@ -31,7 +31,7 @@ enum { PROP_RENDERER }; -G_DEFINE_TYPE (GtkRendererCellAccessible, _gtk_renderer_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) +G_DEFINE_TYPE (GtkRendererCellAccessible, gtk_renderer_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE) static void gtk_renderer_cell_accessible_set_property (GObject *object, @@ -79,11 +79,11 @@ gtk_renderer_cell_accessible_finalize (GObject *object) if (renderer_cell->priv->renderer) g_object_unref (renderer_cell->priv->renderer); - G_OBJECT_CLASS (_gtk_renderer_cell_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_renderer_cell_accessible_parent_class)->finalize (object); } static void -_gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass) +gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -103,7 +103,7 @@ _gtk_renderer_cell_accessible_class_init (GtkRendererCellAccessibleClass *klass) } static void -_gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell) +gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell) { renderer_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (renderer_cell, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, @@ -111,7 +111,7 @@ _gtk_renderer_cell_accessible_init (GtkRendererCellAccessible *renderer_cell) } AtkObject * -_gtk_renderer_cell_accessible_new (GtkCellRenderer *renderer) +gtk_renderer_cell_accessible_new (GtkCellRenderer *renderer) { AtkObject *object; diff --git a/gtk/a11y/gtkrenderercellaccessible.h b/gtk/a11y/gtkrenderercellaccessible.h index 6c08b94c99..082c5e1d56 100644 --- a/gtk/a11y/gtkrenderercellaccessible.h +++ b/gtk/a11y/gtkrenderercellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_RENDERER_CELL_ACCESSIBLE (_gtk_renderer_cell_accessible_get_type ()) +#define GTK_TYPE_RENDERER_CELL_ACCESSIBLE (gtk_renderer_cell_accessible_get_type ()) #define GTK_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessible)) #define GTK_RENDERER_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RENDERER_CELL_ACCESSIBLE, GtkRendererCellAccessibleClass)) #define GTK_IS_RENDERER_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RENDERER_CELL_ACCESSIBLE)) @@ -46,9 +46,9 @@ struct _GtkRendererCellAccessibleClass GtkCellAccessibleClass parent_class; }; -GType _gtk_renderer_cell_accessible_get_type (void); +GType gtk_renderer_cell_accessible_get_type (void); -AtkObject *_gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer); +AtkObject *gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer); G_END_DECLS diff --git a/gtk/a11y/gtkscaleaccessible.c b/gtk/a11y/gtkscaleaccessible.c index 19112aafca..63a7e1a8fc 100644 --- a/gtk/a11y/gtkscaleaccessible.c +++ b/gtk/a11y/gtkscaleaccessible.c @@ -20,7 +20,7 @@ #include <gtk/gtk.h> #include "gtkscaleaccessible.h" -G_DEFINE_TYPE (GtkScaleAccessible, _gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) +G_DEFINE_TYPE (GtkScaleAccessible, gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) static const gchar * gtk_scale_accessible_get_description (AtkObject *object) @@ -36,11 +36,11 @@ gtk_scale_accessible_get_description (AtkObject *object) if (layout) return pango_layout_get_text (layout); - return ATK_OBJECT_CLASS (_gtk_scale_accessible_parent_class)->get_description (object); + return ATK_OBJECT_CLASS (gtk_scale_accessible_parent_class)->get_description (object); } static void -_gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) +gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -48,6 +48,6 @@ _gtk_scale_accessible_class_init (GtkScaleAccessibleClass *klass) } static void -_gtk_scale_accessible_init (GtkScaleAccessible *scale) +gtk_scale_accessible_init (GtkScaleAccessible *scale) { } diff --git a/gtk/a11y/gtkscaleaccessible.h b/gtk/a11y/gtkscaleaccessible.h index 88341e57aa..6423d8d1fa 100644 --- a/gtk/a11y/gtkscaleaccessible.h +++ b/gtk/a11y/gtkscaleaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCALE_ACCESSIBLE (_gtk_scale_accessible_get_type ()) +#define GTK_TYPE_SCALE_ACCESSIBLE (gtk_scale_accessible_get_type ()) #define GTK_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessible)) #define GTK_SCALE_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_ACCESSIBLE, GtkScaleAccessibleClass)) #define GTK_IS_SCALE_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkScaleAccessibleClass GtkRangeAccessibleClass parent_class; }; -GType _gtk_scale_accessible_get_type (void); +GType gtk_scale_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscalebuttonaccessible.c b/gtk/a11y/gtkscalebuttonaccessible.c index 17602f0bb9..98b27c5821 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.c +++ b/gtk/a11y/gtkscalebuttonaccessible.c @@ -26,7 +26,7 @@ static void atk_action_interface_init (AtkActionIface *iface); static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, _gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkScaleButtonAccessible, gtk_scale_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)); @@ -43,7 +43,7 @@ gtk_scale_button_accessible_initialize (AtkObject *obj, { GtkAdjustment *adjustment; - ATK_OBJECT_CLASS (_gtk_scale_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_scale_button_accessible_parent_class)->initialize (obj, data); adjustment = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (data)); if (adjustment) @@ -77,12 +77,12 @@ gtk_scale_button_accessible_notify_gtk (GObject *obj, } else { - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_scale_button_accessible_parent_class)->notify_gtk (obj, pspec); } } static void -_gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) +gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) { AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = GTK_WIDGET_ACCESSIBLE_CLASS (klass); @@ -93,7 +93,7 @@ _gtk_scale_button_accessible_class_init (GtkScaleButtonAccessibleClass *klass) } static void -_gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button) +gtk_scale_button_accessible_init (GtkScaleButtonAccessible *button) { } diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h index af71188dd1..dcbb402058 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.h +++ b/gtk/a11y/gtkscalebuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (_gtk_scale_button_accessible_get_type ()) +#define GTK_TYPE_SCALE_BUTTON_ACCESSIBLE (gtk_scale_button_accessible_get_type ()) #define GTK_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessible)) #define GTK_SCALE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE, GtkScaleButtonAccessibleClass)) #define GTK_IS_SCALE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCALE_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkScaleButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType _gtk_scale_button_accessible_get_type (void); +GType gtk_scale_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscrollbaraccessible.c b/gtk/a11y/gtkscrollbaraccessible.c index 770f21647d..a14d92e096 100644 --- a/gtk/a11y/gtkscrollbaraccessible.c +++ b/gtk/a11y/gtkscrollbaraccessible.c @@ -21,10 +21,10 @@ #include "gtkscrollbaraccessible.h" -G_DEFINE_TYPE (GtkScrollbarAccessible, _gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE) +G_DEFINE_TYPE (GtkScrollbarAccessible, gtk_scrollbar_accessible, GTK_TYPE_RANGE_ACCESSIBLE) static void -_gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible) +gtk_scrollbar_accessible_init (GtkScrollbarAccessible *accessible) { } @@ -32,7 +32,7 @@ static void gtk_scrollbar_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_SCROLL_BAR; } @@ -52,7 +52,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible) parent = gtk_widget_get_parent (widget); if (!GTK_IS_SCROLLED_WINDOW (parent)) - return ATK_OBJECT_CLASS (_gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible); + return ATK_OBJECT_CLASS (gtk_scrollbar_accessible_parent_class)->get_index_in_parent (accessible); scrolled_window = GTK_SCROLLED_WINDOW (parent); id = 0; @@ -82,7 +82,7 @@ gtk_scrollbar_accessible_get_index_in_parent (AtkObject *accessible) } static void -_gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass) +gtk_scrollbar_accessible_class_init (GtkScrollbarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); diff --git a/gtk/a11y/gtkscrollbaraccessible.h b/gtk/a11y/gtkscrollbaraccessible.h index e0945d9f5a..0f870282dc 100644 --- a/gtk/a11y/gtkscrollbaraccessible.h +++ b/gtk/a11y/gtkscrollbaraccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCROLLBAR_ACCESSIBLE (_gtk_scrollbar_accessible_get_type ()) +#define GTK_TYPE_SCROLLBAR_ACCESSIBLE (gtk_scrollbar_accessible_get_type ()) #define GTK_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessible)) #define GTK_SCROLLBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLBAR_ACCESSIBLE, GtkScrollbarAccessibleClass)) #define GTK_IS_SCROLLBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLBAR_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkScrollbarAccessibleClass GtkRangeAccessibleClass parent_class; }; -GType _gtk_scrollbar_accessible_get_type (void); +GType gtk_scrollbar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkscrolledwindowaccessible.c b/gtk/a11y/gtkscrolledwindowaccessible.c index 4b82ce4b8b..13ca519d9e 100644 --- a/gtk/a11y/gtkscrolledwindowaccessible.c +++ b/gtk/a11y/gtkscrolledwindowaccessible.c @@ -21,7 +21,7 @@ #include "gtkscrolledwindowaccessible.h" -G_DEFINE_TYPE (GtkScrolledWindowAccessible, _gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkScrolledWindowAccessible, gtk_scrolled_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void visibility_changed (GObject *object, @@ -88,7 +88,7 @@ gtk_scrolled_window_accessible_initialize (AtkObject *obj, { GtkScrolledWindow *window; - ATK_OBJECT_CLASS (_gtk_scrolled_window_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_scrolled_window_accessible_parent_class)->initialize (obj, data); window = GTK_SCROLLED_WINDOW (data); @@ -178,7 +178,7 @@ gtk_scrolled_window_accessible_ref_child (AtkObject *obj, } static void -_gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass) +gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -188,6 +188,6 @@ _gtk_scrolled_window_accessible_class_init (GtkScrolledWindowAccessibleClass *kl } static void -_gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window) +gtk_scrolled_window_accessible_init (GtkScrolledWindowAccessible *window) { } diff --git a/gtk/a11y/gtkscrolledwindowaccessible.h b/gtk/a11y/gtkscrolledwindowaccessible.h index fc0819ad06..c8cb2ca9fd 100644 --- a/gtk/a11y/gtkscrolledwindowaccessible.h +++ b/gtk/a11y/gtkscrolledwindowaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (_gtk_scrolled_window_accessible_get_type ()) +#define GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE (gtk_scrolled_window_accessible_get_type ()) #define GTK_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessible)) #define GTK_SCROLLED_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE, GtkScrolledWindowAccessibleClass)) #define GTK_IS_SCROLLED_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkScrolledWindowAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_scrolled_window_accessible_get_type (void); +GType gtk_scrolled_window_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkspinbuttonaccessible.c b/gtk/a11y/gtkspinbuttonaccessible.c index 592207d6b3..f3b9fd9f1b 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.c +++ b/gtk/a11y/gtkspinbuttonaccessible.c @@ -24,7 +24,7 @@ static void atk_value_interface_init (AtkValueIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, _gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSpinButtonAccessible, gtk_spin_button_accessible, GTK_TYPE_ENTRY_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init)) static void @@ -47,7 +47,7 @@ gtk_spin_button_accessible_initialize (AtkObject *obj, { GtkAdjustment *adjustment; - ATK_OBJECT_CLASS (_gtk_spin_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_spin_button_accessible_parent_class)->initialize (obj, data); adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (data)); if (adjustment) @@ -76,13 +76,13 @@ gtk_spin_button_accessible_notify_gtk (GObject *obj, spin_button); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_spin_button_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) +gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -93,7 +93,7 @@ _gtk_spin_button_accessible_class_init (GtkSpinButtonAccessibleClass *klass) } static void -_gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button) +gtk_spin_button_accessible_init (GtkSpinButtonAccessible *button) { } diff --git a/gtk/a11y/gtkspinbuttonaccessible.h b/gtk/a11y/gtkspinbuttonaccessible.h index 029c1b7cff..d5445ebc57 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.h +++ b/gtk/a11y/gtkspinbuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (_gtk_spin_button_accessible_get_type ()) +#define GTK_TYPE_SPIN_BUTTON_ACCESSIBLE (gtk_spin_button_accessible_get_type ()) #define GTK_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessible)) #define GTK_SPIN_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE, GtkSpinButtonAccessibleClass)) #define GTK_IS_SPIN_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPIN_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkSpinButtonAccessibleClass GtkEntryAccessibleClass parent_class; }; -GType _gtk_spin_button_accessible_get_type (void); +GType gtk_spin_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkspinneraccessible.c b/gtk/a11y/gtkspinneraccessible.c index c4697ecb72..634da5acda 100644 --- a/gtk/a11y/gtkspinneraccessible.c +++ b/gtk/a11y/gtkspinneraccessible.c @@ -28,14 +28,14 @@ static void atk_image_interface_init (AtkImageIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, _gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSpinnerAccessible, gtk_spinner_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init)); static void gtk_spinner_accessible_initialize (AtkObject *accessible, gpointer widget) { - ATK_OBJECT_CLASS (_gtk_spinner_accessible_parent_class)->initialize (accessible, widget); + ATK_OBJECT_CLASS (gtk_spinner_accessible_parent_class)->initialize (accessible, widget); atk_object_set_name (accessible, C_("throbbing progress animation widget", "Spinner")); atk_object_set_description (accessible, _("Provides visual indication of progress")); @@ -43,7 +43,7 @@ gtk_spinner_accessible_initialize (AtkObject *accessible, } static void -_gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) +gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); @@ -51,7 +51,7 @@ _gtk_spinner_accessible_class_init (GtkSpinnerAccessibleClass *klass) } static void -_gtk_spinner_accessible_init (GtkSpinnerAccessible *self) +gtk_spinner_accessible_init (GtkSpinnerAccessible *self) { } diff --git a/gtk/a11y/gtkspinneraccessible.h b/gtk/a11y/gtkspinneraccessible.h index 6744e093fd..2f31f79f61 100644 --- a/gtk/a11y/gtkspinneraccessible.h +++ b/gtk/a11y/gtkspinneraccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SPINNER_ACCESSIBLE (_gtk_spinner_accessible_get_type ()) +#define GTK_TYPE_SPINNER_ACCESSIBLE (gtk_spinner_accessible_get_type ()) #define GTK_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessible)) #define GTK_SPINNER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SPINNER_ACCESSIBLE, GtkSpinnerAccessibleClass)) #define GTK_IS_SPINNER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SPINNER_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkSpinnerAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_spinner_accessible_get_type (void); +GType gtk_spinner_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkstatusbaraccessible.c b/gtk/a11y/gtkstatusbaraccessible.c index 9330b88313..3c579235fb 100644 --- a/gtk/a11y/gtkstatusbaraccessible.c +++ b/gtk/a11y/gtkstatusbaraccessible.c @@ -22,7 +22,7 @@ #include "gtkstatusbaraccessible.h" -G_DEFINE_TYPE (GtkStatusbarAccessible, _gtk_statusbar_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) +G_DEFINE_TYPE (GtkStatusbarAccessible, gtk_statusbar_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE) static void text_changed (GtkStatusbar *statusbar, @@ -41,7 +41,7 @@ gtk_statusbar_accessible_initialize (AtkObject *obj, { GtkWidget *statusbar = data; - ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->initialize (obj, data); g_signal_connect_after (statusbar, "text-pushed", G_CALLBACK (text_changed), obj); @@ -100,7 +100,7 @@ gtk_statusbar_accessible_get_name (AtkObject *obj) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_statusbar_accessible_parent_class)->get_name (obj); + name = ATK_OBJECT_CLASS (gtk_statusbar_accessible_parent_class)->get_name (obj); if (name != NULL) return name; @@ -125,7 +125,7 @@ gtk_statusbar_accessible_ref_child (AtkObject *obj, } static void -_gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) +gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass; @@ -143,6 +143,6 @@ _gtk_statusbar_accessible_class_init (GtkStatusbarAccessibleClass *klass) } static void -_gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar) +gtk_statusbar_accessible_init (GtkStatusbarAccessible *bar) { } diff --git a/gtk/a11y/gtkstatusbaraccessible.h b/gtk/a11y/gtkstatusbaraccessible.h index d44c136d7f..a476a8300f 100644 --- a/gtk/a11y/gtkstatusbaraccessible.h +++ b/gtk/a11y/gtkstatusbaraccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_STATUSBAR_ACCESSIBLE (_gtk_statusbar_accessible_get_type ()) +#define GTK_TYPE_STATUSBAR_ACCESSIBLE (gtk_statusbar_accessible_get_type ()) #define GTK_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessible)) #define GTK_STATUSBAR_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STATUSBAR_ACCESSIBLE, GtkStatusbarAccessibleClass)) #define GTK_IS_STATUSBAR_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STATUSBAR_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkStatusbarAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_statusbar_accessible_get_type (void); +GType gtk_statusbar_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkswitchaccessible.c b/gtk/a11y/gtkswitchaccessible.c index c3148c4aaa..687845a664 100644 --- a/gtk/a11y/gtkswitchaccessible.c +++ b/gtk/a11y/gtkswitchaccessible.c @@ -32,7 +32,7 @@ static void atk_action_interface_init (AtkActionIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, _gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, gtk_switch_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) static AtkStateSet * @@ -41,7 +41,7 @@ gtk_switch_accessible_ref_state_set (AtkObject *accessible) AtkStateSet *state_set; GtkWidget *widget; - state_set = ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->ref_state_set (accessible); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -57,7 +57,7 @@ static void gtk_switch_accessible_initialize (AtkObject *accessible, gpointer widget) { - ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->initialize (accessible, widget); + ATK_OBJECT_CLASS (gtk_switch_accessible_parent_class)->initialize (accessible, widget); atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON); atk_object_set_name (accessible, C_("light switch widget", "Switch")); @@ -65,7 +65,7 @@ gtk_switch_accessible_initialize (AtkObject *accessible, } static void -_gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) +gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) { AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); @@ -74,7 +74,7 @@ _gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) } static void -_gtk_switch_accessible_init (GtkSwitchAccessible *self) +gtk_switch_accessible_init (GtkSwitchAccessible *self) { } diff --git a/gtk/a11y/gtkswitchaccessible.h b/gtk/a11y/gtkswitchaccessible.h index 0e3760b19f..0666c5d4b5 100644 --- a/gtk/a11y/gtkswitchaccessible.h +++ b/gtk/a11y/gtkswitchaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_SWITCH_ACCESSIBLE (_gtk_switch_accessible_get_type ()) +#define GTK_TYPE_SWITCH_ACCESSIBLE (gtk_switch_accessible_get_type ()) #define GTK_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessible)) #define GTK_SWITCH_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SWITCH_ACCESSIBLE, GtkSwitchAccessibleClass)) #define GTK_IS_SWITCH_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SWITCH_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkSwitchAccessibleClass GtkWidgetAccessibleClass parent_class; }; -GType _gtk_switch_accessible_get_type (void); +GType gtk_switch_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c index 7088780164..869b7f03ae 100644 --- a/gtk/a11y/gtktextcellaccessible.c +++ b/gtk/a11y/gtktextcellaccessible.c @@ -89,7 +89,7 @@ static void gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell static void atk_text_interface_init (AtkTextIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkTextCellAccessible, _gtk_text_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkTextCellAccessible, gtk_text_cell_accessible, GTK_TYPE_RENDERER_CELL_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init)) static AtkStateSet * @@ -97,7 +97,7 @@ gtk_text_cell_accessible_ref_state_set (AtkObject *accessible) { AtkStateSet *state_set; - state_set = ATK_OBJECT_CLASS (_gtk_text_cell_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_text_cell_accessible_parent_class)->ref_state_set (accessible); atk_state_set_add_state (state_set, ATK_STATE_SINGLE_LINE); @@ -111,7 +111,7 @@ gtk_text_cell_accessible_finalize (GObject *object) g_free (text_cell->priv->cell_text); - G_OBJECT_CLASS (_gtk_text_cell_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_text_cell_accessible_parent_class)->finalize (object); } static const gchar * @@ -184,7 +184,7 @@ gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell) } static void -_gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass) +gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass); @@ -201,7 +201,7 @@ _gtk_text_cell_accessible_class_init (GtkTextCellAccessibleClass *klass) } static void -_gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell) +gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell) { text_cell->priv = G_TYPE_INSTANCE_GET_PRIVATE (text_cell, GTK_TYPE_TEXT_CELL_ACCESSIBLE, @@ -563,9 +563,9 @@ gtk_text_cell_accessible_get_character_extents (AtkText *text, parent = atk_object_get_parent (parent); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); g_return_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent)); - _gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), - GTK_CELL_ACCESSIBLE (text), - &rendered_rect); + gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), + GTK_CELL_ACCESSIBLE (text), + &rendered_rect); gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), widget, @@ -651,9 +651,9 @@ gtk_text_cell_accessible_get_offset_at_point (AtkText *text, widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent)); g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE_PARENT (parent), -1); - _gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), - GTK_CELL_ACCESSIBLE (text), - &rendered_rect); + gtk_cell_accessible_parent_get_cell_area (GTK_CELL_ACCESSIBLE_PARENT (parent), + GTK_CELL_ACCESSIBLE (text), + &rendered_rect); gtk_cell_renderer_get_preferred_size (GTK_CELL_RENDERER (gtk_renderer), widget, diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h index 92f8b1b908..692ba70cae 100644 --- a/gtk/a11y/gtktextcellaccessible.h +++ b/gtk/a11y/gtktextcellaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TEXT_CELL_ACCESSIBLE (_gtk_text_cell_accessible_get_type ()) +#define GTK_TYPE_TEXT_CELL_ACCESSIBLE (gtk_text_cell_accessible_get_type ()) #define GTK_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessible)) #define GTK_TEXT_CELL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TEXT_CELL_ACCESSIBLE, GtkTextCellAccessibleClass)) #define GTK_IS_TEXT_CELL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_CELL_ACCESSIBLE)) @@ -46,7 +46,7 @@ struct _GtkTextCellAccessibleClass GtkRendererCellAccessibleClass parent_class; }; -GType _gtk_text_cell_accessible_get_type (void); +GType gtk_text_cell_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index 67d6ac641e..7410c4ebb6 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -28,7 +28,7 @@ #include <glib-object.h> #include <glib/gstdio.h> #include <gtk/gtk.h> -#include "gtktextviewaccessible.h" +#include "gtktextviewaccessibleprivate.h" #include "gtk/gtkwidgetprivate.h" struct _GtkTextViewAccessiblePrivate @@ -56,7 +56,7 @@ static void atk_editable_text_interface_init (AtkEditableTextIface *if static void atk_text_interface_init (AtkTextIface *iface); static void atk_streamable_content_interface_init (AtkStreamableContentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, _gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkTextViewAccessible, gtk_text_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_EDITABLE_TEXT, atk_editable_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_TEXT, atk_text_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_STREAMABLE_CONTENT, atk_streamable_content_interface_init)) @@ -66,7 +66,7 @@ static void gtk_text_view_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->initialize (obj, data); obj->role = ATK_ROLE_TEXT; } @@ -87,7 +87,7 @@ gtk_text_view_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_EDITABLE, editable); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_text_view_accessible_parent_class)->notify_gtk (obj, pspec); } static AtkStateSet* @@ -100,7 +100,7 @@ gtk_text_view_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_text_view_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_text_view_accessible_parent_class)->ref_state_set (accessible); if (gtk_text_view_get_editable (GTK_TEXT_VIEW (widget))) atk_state_set_add_state (state_set, ATK_STATE_EDITABLE); @@ -144,7 +144,7 @@ gtk_text_view_accessible_widget_unset (GtkAccessible *accessible) } static void -_gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) +gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS (klass); @@ -162,7 +162,7 @@ _gtk_text_view_accessible_class_init (GtkTextViewAccessibleClass *klass) } static void -_gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) +gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) { accessible->priv = G_TYPE_INSTANCE_GET_PRIVATE (accessible, GTK_TYPE_TEXT_VIEW_ACCESSIBLE, diff --git a/gtk/a11y/gtktextviewaccessible.h b/gtk/a11y/gtktextviewaccessible.h index 3028b12304..87e0d70cf9 100644 --- a/gtk/a11y/gtktextviewaccessible.h +++ b/gtk/a11y/gtktextviewaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (_gtk_text_view_accessible_get_type ()) +#define GTK_TYPE_TEXT_VIEW_ACCESSIBLE (gtk_text_view_accessible_get_type ()) #define GTK_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessible)) #define GTK_TEXT_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW_ACCESSIBLE, GtkTextViewAccessibleClass)) #define GTK_IS_TEXT_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TEXT_VIEW_ACCESSIBLE)) @@ -45,10 +45,7 @@ struct _GtkTextViewAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_text_view_accessible_get_type (void); - -void _gtk_text_view_accessible_set_buffer (GtkTextView *textview, - GtkTextBuffer *old_buffer); +GType gtk_text_view_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktextviewaccessibleprivate.h b/gtk/a11y/gtktextviewaccessibleprivate.h new file mode 100644 index 0000000000..94cbe2238e --- /dev/null +++ b/gtk/a11y/gtktextviewaccessibleprivate.h @@ -0,0 +1,30 @@ +/* GAIL - The GNOME Accessibility Implementation Library + * Copyright 2001 Sun Microsystems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__ +#define __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__ + +#include "gtktextviewaccessible.h" + +G_BEGIN_DECLS + +void _gtk_text_view_accessible_set_buffer (GtkTextView *textview, + GtkTextBuffer *old_buffer); + +G_END_DECLS + +#endif /* __GTK_TEXT_VIEW_ACCESSIBLE_PRIVATE_H__ */ diff --git a/gtk/a11y/gtktogglebuttonaccessible.c b/gtk/a11y/gtktogglebuttonaccessible.c index 50c3d7013c..12674598d0 100644 --- a/gtk/a11y/gtktogglebuttonaccessible.c +++ b/gtk/a11y/gtktogglebuttonaccessible.c @@ -22,7 +22,7 @@ #include "gtktogglebuttonaccessible.h" -G_DEFINE_TYPE (GtkToggleButtonAccessible, _gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) +G_DEFINE_TYPE (GtkToggleButtonAccessible, gtk_toggle_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) static void gtk_toggle_button_accessible_toggled (GtkWidget *widget) @@ -41,7 +41,7 @@ static void gtk_toggle_button_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (gtk_toggle_button_accessible_toggled), NULL); @@ -74,7 +74,7 @@ gtk_toggle_button_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_toggle_button_accessible_parent_class)->notify_gtk (obj, pspec); } static AtkStateSet* @@ -88,7 +88,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_toggle_button_accessible_parent_class)->ref_state_set (accessible); toggle_button = GTK_TOGGLE_BUTTON (widget); if (gtk_toggle_button_get_active (toggle_button)) @@ -104,7 +104,7 @@ gtk_toggle_button_accessible_ref_state_set (AtkObject *accessible) } static void -_gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) +gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; @@ -116,6 +116,6 @@ _gtk_toggle_button_accessible_class_init (GtkToggleButtonAccessibleClass *klass) } static void -_gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button) +gtk_toggle_button_accessible_init (GtkToggleButtonAccessible *button) { } diff --git a/gtk/a11y/gtktogglebuttonaccessible.h b/gtk/a11y/gtktogglebuttonaccessible.h index 3d828178da..67ab56ee2a 100644 --- a/gtk/a11y/gtktogglebuttonaccessible.h +++ b/gtk/a11y/gtktogglebuttonaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (_gtk_toggle_button_accessible_get_type ()) +#define GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE (gtk_toggle_button_accessible_get_type ()) #define GTK_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessible)) #define GTK_TOGGLE_BUTTON_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE, GtkToggleButtonAccessibleClass)) #define GTK_IS_TOGGLE_BUTTON_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkToggleButtonAccessibleClass GtkButtonAccessibleClass parent_class; }; -GType _gtk_toggle_button_accessible_get_type (void); +GType gtk_toggle_button_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktoplevelaccessible.c b/gtk/a11y/gtktoplevelaccessible.c index dd14980cc9..48e61c7e21 100644 --- a/gtk/a11y/gtktoplevelaccessible.c +++ b/gtk/a11y/gtktoplevelaccessible.c @@ -35,13 +35,13 @@ struct _GtkToplevelAccessiblePrivate GList *window_list; }; -G_DEFINE_TYPE (GtkToplevelAccessible, _gtk_toplevel_accessible, ATK_TYPE_OBJECT) +G_DEFINE_TYPE (GtkToplevelAccessible, gtk_toplevel_accessible, ATK_TYPE_OBJECT) static void gtk_toplevel_accessible_initialize (AtkObject *accessible, gpointer data) { - ATK_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->initialize (accessible, data); + ATK_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->initialize (accessible, data); accessible->role = ATK_ROLE_APPLICATION; accessible->name = g_get_prgname (); @@ -56,7 +56,7 @@ gtk_toplevel_accessible_object_finalize (GObject *obj) if (toplevel->priv->window_list) g_list_free (toplevel->priv->window_list); - G_OBJECT_CLASS (_gtk_toplevel_accessible_parent_class)->finalize (obj); + G_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->finalize (obj); } static gint @@ -134,7 +134,7 @@ is_attached_menu_window (GtkWidget *widget) } static void -_gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass) +gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS(klass); GObjectClass *g_object_class = G_OBJECT_CLASS(klass); @@ -247,7 +247,7 @@ hide_event_watcher (GSignalInvocationHint *ihint, } static void -_gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) +gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) { GtkWindow *window; GtkWidget *widget; @@ -297,7 +297,7 @@ _gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel) } GList * -_gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible) +gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible) { return accessible->priv->window_list; } diff --git a/gtk/a11y/gtktoplevelaccessible.h b/gtk/a11y/gtktoplevelaccessible.h index 3d4df845ea..ab15a82607 100644 --- a/gtk/a11y/gtktoplevelaccessible.h +++ b/gtk/a11y/gtktoplevelaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_TOPLEVEL_ACCESSIBLE (_gtk_toplevel_accessible_get_type ()) +#define GTK_TYPE_TOPLEVEL_ACCESSIBLE (gtk_toplevel_accessible_get_type ()) #define GTK_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessible)) #define GTK_TOPLEVEL_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TOPLEVEL_ACCESSIBLE, GtkToplevelAccessibleClass)) #define GTK_IS_TOPLEVEL_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TOPLEVEL_ACCESSIBLE)) @@ -45,8 +45,8 @@ struct _GtkToplevelAccessibleClass AtkObjectClass parent_class; }; -GType _gtk_toplevel_accessible_get_type (void); -GList *_gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible); +GType gtk_toplevel_accessible_get_type (void); +GList *gtk_toplevel_accessible_get_children (GtkToplevelAccessible *accessible); G_END_DECLS diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c index 4a21dc0a1c..7ac2c3b723 100644 --- a/gtk/a11y/gtktreeviewaccessible.c +++ b/gtk/a11y/gtktreeviewaccessible.c @@ -25,13 +25,15 @@ #include "gtktreeprivate.h" #include "gtkwidgetprivate.h" -#include "gtktreeviewaccessible.h" +#include "gtktreeviewaccessibleprivate.h" + #include "gtkrenderercellaccessible.h" #include "gtkbooleancellaccessible.h" #include "gtkimagecellaccessible.h" #include "gtkcontainercellaccessible.h" #include "gtktextcellaccessible.h" #include "gtkcellaccessibleparent.h" +#include "gtkcellaccessibleprivate.h" struct _GtkTreeViewAccessiblePrivate { @@ -79,7 +81,7 @@ static void atk_selection_interface_init (AtkSelectionIface static void atk_component_interface_init (AtkComponentIface *iface); static void gtk_cell_accessible_parent_interface_init (GtkCellAccessibleParentIface *iface); -G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, _gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, +G_DEFINE_TYPE_WITH_CODE (GtkTreeViewAccessible, gtk_tree_view_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE, atk_table_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) @@ -143,7 +145,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, GtkTreeModel *tree_model; GtkWidget *widget; - ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->initialize (obj, data); accessible = GTK_TREE_VIEW_ACCESSIBLE (obj); @@ -171,7 +173,7 @@ gtk_tree_view_accessible_finalize (GObject *object) if (accessible->priv->cell_infos) g_hash_table_destroy (accessible->priv->cell_infos); - G_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->finalize (object); + G_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->finalize (object); } static void @@ -212,7 +214,7 @@ gtk_tree_view_accessible_notify_gtk (GObject *obj, g_object_thaw_notify (G_OBJECT (accessible)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->notify_gtk (obj, pspec); } static void @@ -222,7 +224,7 @@ gtk_tree_view_accessible_widget_unset (GtkAccessible *gtkaccessible) g_hash_table_remove_all (accessible->priv->cell_infos); - GTK_ACCESSIBLE_CLASS (_gtk_tree_view_accessible_parent_class)->widget_unset (gtkaccessible); + GTK_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->widget_unset (gtkaccessible); } static gint @@ -255,6 +257,7 @@ get_n_columns (GtkTreeView *tree_view) return visible_columns; } + static gint gtk_tree_view_accessible_get_n_children (AtkObject *obj) { @@ -378,10 +381,10 @@ create_cell (GtkTreeView *treeview, { GtkCellAccessible *container_cell; - container = _gtk_container_cell_accessible_new (); + container = gtk_container_cell_accessible_new (); container_cell = GTK_CELL_ACCESSIBLE (container); - _gtk_cell_accessible_initialise (container_cell, GTK_WIDGET (treeview), ATK_OBJECT (accessible)); + _gtk_cell_accessible_initialize (container_cell, GTK_WIDGET (treeview), ATK_OBJECT (accessible)); /* The GtkTreeViewAccessibleCellInfo structure for the container will * be before the ones for the cells so that the first one we find for @@ -399,16 +402,16 @@ create_cell (GtkTreeView *treeview, { renderer = GTK_CELL_RENDERER (l->data); - cell = GTK_CELL_ACCESSIBLE (_gtk_renderer_cell_accessible_new (renderer)); + cell = GTK_CELL_ACCESSIBLE (gtk_renderer_cell_accessible_new (renderer)); /* Create the GtkTreeViewAccessibleCellInfo for this cell */ if (parent == ATK_OBJECT (accessible)) cell_info_new (accessible, tree, node, column, cell); - _gtk_cell_accessible_initialise (cell, GTK_WIDGET (treeview), parent); + _gtk_cell_accessible_initialize (cell, GTK_WIDGET (treeview), parent); if (container) - _gtk_container_cell_accessible_add_child (container, cell); + gtk_container_cell_accessible_add_child (container, cell); } g_list_free (renderer_list); if (container) @@ -491,7 +494,7 @@ gtk_tree_view_accessible_ref_state_set (AtkObject *obj) AtkStateSet *state_set; GtkWidget *widget; - state_set = ATK_OBJECT_CLASS (_gtk_tree_view_accessible_parent_class)->ref_state_set (obj); + state_set = ATK_OBJECT_CLASS (gtk_tree_view_accessible_parent_class)->ref_state_set (obj); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); if (widget != NULL) @@ -501,7 +504,7 @@ gtk_tree_view_accessible_ref_state_set (AtkObject *obj) } static void -_gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) +gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); @@ -531,7 +534,7 @@ _gtk_tree_view_accessible_class_init (GtkTreeViewAccessibleClass *klass) } static void -_gtk_tree_view_accessible_init (GtkTreeViewAccessible *view) +gtk_tree_view_accessible_init (GtkTreeViewAccessible *view) { view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, GTK_TYPE_TREE_VIEW_ACCESSIBLE, @@ -1881,7 +1884,7 @@ _gtk_tree_view_accessible_update_focus_column (GtkTreeView *treeview, _gtk_cell_accessible_state_changed (cell, 0, GTK_CELL_RENDERER_FOCUSED); else cell = create_cell (treeview, accessible, cursor_tree, cursor_node, new_focus); - + g_signal_emit_by_name (accessible, "active-descendant-changed", cell); } } @@ -1905,19 +1908,19 @@ _gtk_tree_view_accessible_add_state (GtkTreeView *treeview, if (state == GTK_CELL_RENDERER_FOCUSED) { GtkTreeViewColumn *focus_column; - + focus_column = get_effective_focus_column (treeview, _gtk_tree_view_get_focus_column (treeview)); if (focus_column) { GtkCellAccessible *cell; - + cell = peek_cell (accessible, tree, node, focus_column); if (cell != NULL) _gtk_cell_accessible_state_changed (cell, 0, state); else cell = create_cell (treeview, accessible, tree, node, focus_column); - + g_signal_emit_by_name (accessible, "active-descendant-changed", cell); } diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h index badc2d773b..2a39faffaa 100644 --- a/gtk/a11y/gtktreeviewaccessible.h +++ b/gtk/a11y/gtktreeviewaccessible.h @@ -19,11 +19,10 @@ #define __GTK_TREE_VIEW_ACCESSIBLE_H__ #include "gtkcontaineraccessible.h" -#include "gtktreeprivate.h" G_BEGIN_DECLS -#define GTK_TYPE_TREE_VIEW_ACCESSIBLE (_gtk_tree_view_accessible_get_type ()) +#define GTK_TYPE_TREE_VIEW_ACCESSIBLE (gtk_tree_view_accessible_get_type ()) #define GTK_TREE_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_ACCESSIBLE, GtkTreeViewAccessible)) #define GTK_TREE_VIEW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_ACCESSIBLE, GtkTreeViewAccessibleClass)) #define GTK_IS_TREE_VIEW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_ACCESSIBLE)) @@ -46,45 +45,7 @@ struct _GtkTreeViewAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_tree_view_accessible_get_type (void); - -/* called by treeview code */ -void _gtk_tree_view_accessible_reorder (GtkTreeView *treeview); -void _gtk_tree_view_accessible_add (GtkTreeView *treeview, - GtkRBTree *tree, - GtkRBNode *node); -void _gtk_tree_view_accessible_remove (GtkTreeView *treeview, - GtkRBTree *tree, - GtkRBNode *node); -void _gtk_tree_view_accessible_changed (GtkTreeView *treeview, - GtkRBTree *tree, - GtkRBNode *node); - - -void _gtk_tree_view_accessible_add_column (GtkTreeView *treeview, - GtkTreeViewColumn *column, - guint id); -void _gtk_tree_view_accessible_remove_column (GtkTreeView *treeview, - GtkTreeViewColumn *column, - guint id); -void _gtk_tree_view_accessible_reorder_column(GtkTreeView *treeview, - GtkTreeViewColumn *column); -void _gtk_tree_view_accessible_toggle_visibility - (GtkTreeView *treeview, - GtkTreeViewColumn *column); -void _gtk_tree_view_accessible_update_focus_column - (GtkTreeView *treeview, - GtkTreeViewColumn *old_focus, - GtkTreeViewColumn *new_focus); - -void _gtk_tree_view_accessible_add_state (GtkTreeView *treeview, - GtkRBTree *tree, - GtkRBNode *node, - GtkCellRendererState state); -void _gtk_tree_view_accessible_remove_state (GtkTreeView *treeview, - GtkRBTree *tree, - GtkRBNode *node, - GtkCellRendererState state); +GType gtk_tree_view_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtktreeviewaccessibleprivate.h b/gtk/a11y/gtktreeviewaccessibleprivate.h new file mode 100644 index 0000000000..410ff22057 --- /dev/null +++ b/gtk/a11y/gtktreeviewaccessibleprivate.h @@ -0,0 +1,65 @@ +/* GAIL - The GNOME Accessibility Implementation Library + * Copyright 2001 Sun Microsystems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__ +#define __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__ + +#include "gtktreeviewaccessible.h" + +G_BEGIN_DECLS + +/* called by treeview code */ +void _gtk_tree_view_accessible_reorder (GtkTreeView *treeview); +void _gtk_tree_view_accessible_add (GtkTreeView *treeview, + GtkRBTree *tree, + GtkRBNode *node); +void _gtk_tree_view_accessible_remove (GtkTreeView *treeview, + GtkRBTree *tree, + GtkRBNode *node); +void _gtk_tree_view_accessible_changed (GtkTreeView *treeview, + GtkRBTree *tree, + GtkRBNode *node); + +void _gtk_tree_view_accessible_add_column (GtkTreeView *treeview, + GtkTreeViewColumn *column, + guint id); +void _gtk_tree_view_accessible_remove_column (GtkTreeView *treeview, + GtkTreeViewColumn *column, + guint id); +void _gtk_tree_view_accessible_reorder_column + (GtkTreeView *treeview, + GtkTreeViewColumn *column); +void _gtk_tree_view_accessible_toggle_visibility + (GtkTreeView *treeview, + GtkTreeViewColumn *column); +void _gtk_tree_view_accessible_update_focus_column + (GtkTreeView *treeview, + GtkTreeViewColumn *old_focus, + GtkTreeViewColumn *new_focus); + +void _gtk_tree_view_accessible_add_state (GtkTreeView *treeview, + GtkRBTree *tree, + GtkRBNode *node, + GtkCellRendererState state); +void _gtk_tree_view_accessible_remove_state (GtkTreeView *treeview, + GtkRBTree *tree, + GtkRBNode *node, + GtkCellRendererState state); + +G_END_DECLS + +#endif /* __GTK_TREE_VIEW_ACCESSIBLE_PRIVATE_H__ */ 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, diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h index 3294c07fd2..2ce5ad0003 100644 --- a/gtk/a11y/gtkwidgetaccessible.h +++ b/gtk/a11y/gtkwidgetaccessible.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_WIDGET_ACCESSIBLE (_gtk_widget_accessible_get_type ()) +#define GTK_TYPE_WIDGET_ACCESSIBLE (gtk_widget_accessible_get_type ()) #define GTK_WIDGET_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessible)) #define GTK_WIDGET_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET_ACCESSIBLE, GtkWidgetAccessibleClass)) #define GTK_IS_WIDGET_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WIDGET_ACCESSIBLE)) @@ -53,10 +53,7 @@ struct _GtkWidgetAccessibleClass }; -GType _gtk_widget_accessible_get_type (void); - -void _gtk_widget_accessible_set_layer (GtkWidgetAccessible *accessible, - AtkLayer layer); +GType gtk_widget_accessible_get_type (void); G_END_DECLS diff --git a/gtk/a11y/gtkwidgetaccessibleprivate.h b/gtk/a11y/gtkwidgetaccessibleprivate.h new file mode 100644 index 0000000000..f346be5ceb --- /dev/null +++ b/gtk/a11y/gtkwidgetaccessibleprivate.h @@ -0,0 +1,30 @@ +/* GAIL - The GNOME Accessibility Implementation Library + * Copyright 2001 Sun Microsystems Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__ +#define __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__ + +#include "gtkwidgetaccessible.h" + +G_BEGIN_DECLS + +void _gtk_widget_accessible_set_layer (GtkWidgetAccessible *accessible, + AtkLayer layer); + +G_END_DECLS + +#endif /* __GTK_WIDGET_ACCESSIBLE_PRIVATE_H__ */ diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c index fbc854a5f1..c76d7d8ae3 100644 --- a/gtk/a11y/gtkwindowaccessible.c +++ b/gtk/a11y/gtkwindowaccessible.c @@ -20,6 +20,7 @@ #include <gtk/gtk.h> +#include "gtkwidgetaccessibleprivate.h" #include "gtkwindowaccessible.h" #include "gtktoplevelaccessible.h" @@ -39,7 +40,7 @@ static void atk_component_interface_init (AtkComponentIface *iface); static void atk_window_interface_init (AtkWindowIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkWindowAccessible, - _gtk_window_accessible, + gtk_window_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init) @@ -67,7 +68,7 @@ gtk_window_accessible_notify_gtk (GObject *obj, g_signal_emit_by_name (atk_obj, "visible-data-changed"); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_window_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (gtk_window_accessible_parent_class)->notify_gtk (obj, pspec); } static gboolean @@ -90,7 +91,7 @@ gtk_window_accessible_initialize (AtkObject *obj, GtkWidget *widget = GTK_WIDGET (data); const gchar *name; - ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "window-state-event", G_CALLBACK (window_state_event_cb), NULL); _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW); @@ -146,7 +147,7 @@ gtk_window_accessible_get_name (AtkObject *accessible) if (widget == NULL) return NULL; - name = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->get_name (accessible); + name = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_name (accessible); if (name != NULL) return name; @@ -178,7 +179,7 @@ gtk_window_accessible_get_index_in_parent (AtkObject *accessible) if (widget == NULL) return -1; - index = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->get_index_in_parent (accessible); + index = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->get_index_in_parent (accessible); if (index != -1) return index; @@ -190,7 +191,7 @@ gtk_window_accessible_get_index_in_parent (AtkObject *accessible) if (GTK_IS_TOPLEVEL_ACCESSIBLE (atk_obj)) { GtkToplevelAccessible *toplevel = GTK_TOPLEVEL_ACCESSIBLE (atk_obj); - index = g_list_index (_gtk_toplevel_accessible_get_children (toplevel), window); + index = g_list_index (gtk_toplevel_accessible_get_children (toplevel), window); } else { @@ -222,7 +223,7 @@ gtk_window_accessible_ref_relation_set (AtkObject *obj) if (widget == NULL) return NULL; - relation_set = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->ref_relation_set (obj); + relation_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_relation_set (obj); if (atk_object_get_role (obj) == ATK_ROLE_TOOL_TIP) { @@ -254,7 +255,7 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_window_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->ref_state_set (accessible); window = GTK_WINDOW (widget); @@ -278,7 +279,7 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible) } static void -_gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) +gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) { GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; AtkObjectClass *class = ATK_OBJECT_CLASS (klass); @@ -294,7 +295,7 @@ _gtk_window_accessible_class_init (GtkWindowAccessibleClass *klass) } static void -_gtk_window_accessible_init (GtkWindowAccessible *accessible) +gtk_window_accessible_init (GtkWindowAccessible *accessible) { } diff --git a/gtk/a11y/gtkwindowaccessible.h b/gtk/a11y/gtkwindowaccessible.h index 11574ebc32..28a62550c8 100644 --- a/gtk/a11y/gtkwindowaccessible.h +++ b/gtk/a11y/gtkwindowaccessible.h @@ -22,7 +22,7 @@ G_BEGIN_DECLS -#define GTK_TYPE_WINDOW_ACCESSIBLE (_gtk_window_accessible_get_type ()) +#define GTK_TYPE_WINDOW_ACCESSIBLE (gtk_window_accessible_get_type ()) #define GTK_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessible)) #define GTK_WINDOW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW_ACCESSIBLE, GtkWindowAccessibleClass)) #define GTK_IS_WINDOW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW_ACCESSIBLE)) @@ -45,7 +45,7 @@ struct _GtkWindowAccessibleClass GtkContainerAccessibleClass parent_class; }; -GType _gtk_window_accessible_get_type (void); +GType gtk_window_accessible_get_type (void); G_END_DECLS diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 87041faf49..7e22f014a7 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -250,6 +250,7 @@ gtk_application_window_get_id gtk_application_window_new gtk_application_window_set_show_menubar gtk_application_get_active_window +gtk_arrow_accessible_get_type gtk_arrow_get_type gtk_arrow_new gtk_arrow_placement_get_type @@ -301,6 +302,7 @@ gtk_binding_set_find gtk_binding_set_new gtk_bin_get_child gtk_bin_get_type +gtk_boolean_cell_accessible_get_type gtk_border_copy gtk_border_free gtk_border_get_type @@ -348,6 +350,7 @@ gtk_builder_new gtk_builder_set_translation_domain gtk_builder_value_from_string gtk_builder_value_from_string_type +gtk_button_accessible_get_type gtk_button_box_get_child_secondary gtk_button_box_get_child_non_homogeneous gtk_button_box_get_layout @@ -406,6 +409,16 @@ gtk_calendar_set_detail_height_rows gtk_calendar_set_detail_width_chars gtk_calendar_set_display_options gtk_calendar_unmark_day +gtk_cell_accessible_get_type +gtk_cell_accessible_parent_activate +gtk_cell_accessible_parent_edit +gtk_cell_accessible_parent_expand_collapse +gtk_cell_accessible_parent_get_cell_area +gtk_cell_accessible_parent_get_cell_extents +gtk_cell_accessible_parent_get_child_index +gtk_cell_accessible_parent_get_renderer_state +gtk_cell_accessible_parent_get_type +gtk_cell_accessible_parent_grab_focus gtk_cell_area_activate gtk_cell_area_activate_cell gtk_cell_area_add @@ -557,6 +570,7 @@ gtk_check_button_get_type gtk_check_button_new gtk_check_button_new_with_label gtk_check_button_new_with_mnemonic +gtk_check_menu_item_accessible_get_type gtk_check_menu_item_get_active gtk_check_menu_item_get_draw_as_radio gtk_check_menu_item_get_inconsistent @@ -647,6 +661,7 @@ gtk_color_selection_set_has_palette gtk_color_selection_set_previous_alpha gtk_color_selection_set_previous_color gtk_color_selection_set_previous_rgba +gtk_combo_box_accessible_get_type gtk_combo_box_get_active gtk_combo_box_get_active_id gtk_combo_box_get_active_iter @@ -701,8 +716,14 @@ gtk_combo_box_text_prepend gtk_combo_box_text_prepend_text gtk_combo_box_text_remove gtk_combo_box_text_remove_all +gtk_container_accessible_get_type gtk_container_add gtk_container_add_with_properties +gtk_container_cell_accessible_add_child +gtk_container_cell_accessible_get_children +gtk_container_cell_accessible_get_type +gtk_container_cell_accessible_new +gtk_container_cell_accessible_remove_child gtk_container_check_resize gtk_container_child_get gtk_container_child_get_property @@ -851,6 +872,7 @@ gtk_editable_paste_clipboard gtk_editable_select_region gtk_editable_set_editable gtk_editable_set_position +gtk_entry_accessible_get_type gtk_entry_buffer_delete_text gtk_entry_buffer_emit_deleted_text gtk_entry_buffer_emit_inserted_text @@ -927,6 +949,7 @@ gtk_entry_get_text_length gtk_entry_get_type gtk_entry_get_visibility gtk_entry_get_width_chars +gtk_entry_icon_accessible_get_type gtk_entry_icon_position_get_type gtk_entry_im_context_filter_keypress gtk_entry_layout_index_to_text_index @@ -974,6 +997,7 @@ gtk_event_box_new gtk_event_box_set_above_child gtk_event_box_set_visible_window gtk_events_pending +gtk_expander_accessible_get_type gtk_expander_get_expanded gtk_expander_get_label gtk_expander_get_label_fill @@ -1141,6 +1165,7 @@ gtk_font_selection_get_type gtk_font_selection_new gtk_font_selection_set_font_name gtk_font_selection_set_preview_text +gtk_frame_accessible_get_type gtk_frame_get_label gtk_frame_get_label_align gtk_frame_get_label_widget @@ -1298,6 +1323,7 @@ gtk_icon_theme_rescan_if_needed gtk_icon_theme_set_custom_theme gtk_icon_theme_set_screen gtk_icon_theme_set_search_path +gtk_icon_view_accessible_get_type gtk_icon_view_convert_widget_to_bin_window_coords gtk_icon_view_create_drag_icon gtk_icon_view_drop_position_get_type @@ -1363,6 +1389,8 @@ gtk_icon_view_unselect_path gtk_icon_view_unset_model_drag_dest gtk_icon_view_unset_model_drag_source gtk_identifier_get_type +gtk_image_accessible_get_type +gtk_image_cell_accessible_get_type gtk_image_clear gtk_image_get_animation gtk_image_get_gicon @@ -1457,6 +1485,7 @@ gtk_junction_sides_get_type gtk_justification_get_type gtk_key_snooper_install gtk_key_snooper_remove +gtk_label_accessible_get_type gtk_label_get_angle gtk_label_get_attributes gtk_label_get_current_uri @@ -1514,6 +1543,7 @@ gtk_layout_set_hadjustment gtk_layout_set_size gtk_layout_set_vadjustment gtk_license_get_type +gtk_link_button_accessible_get_type gtk_link_button_get_type gtk_link_button_get_uri gtk_link_button_get_visited @@ -1543,6 +1573,7 @@ gtk_list_store_set_valist gtk_list_store_set_value gtk_list_store_set_valuesv gtk_list_store_swap +gtk_lock_button_accessible_get_type gtk_lock_button_get_type gtk_lock_button_new gtk_lock_button_get_permission @@ -1553,6 +1584,7 @@ gtk_main_iteration gtk_main_iteration_do gtk_main_level gtk_main_quit +gtk_menu_accessible_get_type gtk_menu_attach gtk_menu_attach_to_widget gtk_menu_bar_get_child_pack_direction @@ -1584,6 +1616,7 @@ gtk_menu_get_reserve_toggle_size gtk_menu_get_tearoff_state gtk_menu_get_title gtk_menu_get_type +gtk_menu_item_accessible_get_type gtk_menu_item_activate gtk_menu_item_deselect gtk_menu_item_get_accel_path @@ -1620,6 +1653,7 @@ gtk_menu_set_reserve_toggle_size gtk_menu_set_screen gtk_menu_set_tearoff_state gtk_menu_set_title +gtk_menu_shell_accessible_get_type gtk_menu_shell_activate_item gtk_menu_shell_append gtk_menu_shell_bind_model @@ -1665,6 +1699,7 @@ gtk_mount_operation_new gtk_mount_operation_set_parent gtk_mount_operation_set_screen gtk_movement_step_get_type +gtk_notebook_accessible_get_type gtk_notebook_append_page gtk_notebook_append_page_menu gtk_notebook_get_action_widget @@ -1689,6 +1724,9 @@ gtk_notebook_insert_page gtk_notebook_insert_page_menu gtk_notebook_new gtk_notebook_next_page +gtk_notebook_page_accessible_get_type +gtk_notebook_page_accessible_invalidate +gtk_notebook_page_accessible_new gtk_notebook_page_num gtk_notebook_popup_disable gtk_notebook_popup_enable @@ -1794,6 +1832,7 @@ gtk_paint_slider gtk_paint_spinner gtk_paint_tab gtk_paint_vline +gtk_paned_accessible_get_type gtk_paned_add1 gtk_paned_add2 gtk_paned_get_child1 @@ -2116,6 +2155,7 @@ gtk_print_win32_devnames_from_printer_name gtk_print_win32_devnames_from_win32 gtk_print_win32_devnames_to_win32 #endif +gtk_progress_bar_accessible_get_type gtk_progress_bar_get_ellipsize gtk_progress_bar_get_fraction gtk_progress_bar_get_inverted @@ -2139,6 +2179,7 @@ gtk_radio_action_join_group gtk_radio_action_new gtk_radio_action_set_current_value gtk_radio_action_set_group +gtk_radio_button_accessible_get_type gtk_radio_button_get_group gtk_radio_button_get_type gtk_radio_button_join_group @@ -2149,6 +2190,7 @@ gtk_radio_button_new_with_label_from_widget gtk_radio_button_new_with_mnemonic gtk_radio_button_new_with_mnemonic_from_widget gtk_radio_button_set_group +gtk_radio_menu_item_accessible_get_type gtk_radio_menu_item_get_group gtk_radio_menu_item_get_type gtk_radio_menu_item_new @@ -2165,6 +2207,7 @@ gtk_radio_tool_button_new_from_stock gtk_radio_tool_button_new_from_widget gtk_radio_tool_button_new_with_stock_from_widget gtk_radio_tool_button_set_group +gtk_range_accessible_get_type gtk_range_get_adjustment gtk_range_get_fill_level gtk_range_get_flippable @@ -2335,6 +2378,8 @@ gtk_render_activity gtk_render_arrow gtk_render_background gtk_render_check +gtk_renderer_cell_accessible_get_type +gtk_renderer_cell_accessible_new gtk_render_expander gtk_render_extension gtk_render_focus @@ -2355,7 +2400,9 @@ gtk_requisition_new gtk_resize_mode_get_type gtk_response_type_get_type gtk_rgb_to_hsv +gtk_scale_accessible_get_type gtk_scale_add_mark +gtk_scale_button_accessible_get_type gtk_scale_button_get_adjustment gtk_scale_button_get_minus_button gtk_scale_button_get_plus_button @@ -2390,8 +2437,10 @@ gtk_scrollable_set_hadjustment gtk_scrollable_set_hscroll_policy gtk_scrollable_set_vadjustment gtk_scrollable_set_vscroll_policy +gtk_scrollbar_accessible_get_type gtk_scrollbar_get_type gtk_scrollbar_new +gtk_scrolled_window_accessible_get_type gtk_scrolled_window_add_with_viewport gtk_scrolled_window_get_hadjustment gtk_scrolled_window_get_hscrollbar @@ -2492,6 +2541,7 @@ gtk_socket_get_type gtk_socket_new #endif gtk_sort_type_get_type +gtk_spin_button_accessible_get_type gtk_spin_button_configure gtk_spin_button_get_adjustment gtk_spin_button_get_digits @@ -2518,6 +2568,7 @@ gtk_spin_button_set_wrap gtk_spin_button_spin gtk_spin_button_update gtk_spin_button_update_policy_get_type +gtk_spinner_accessible_get_type gtk_spinner_get_type gtk_spinner_new gtk_spinner_start @@ -2525,6 +2576,7 @@ gtk_spinner_stop gtk_spin_type_get_type gtk_state_flags_get_type gtk_state_type_get_type +gtk_statusbar_accessible_get_type gtk_statusbar_get_context_id gtk_statusbar_get_message_area gtk_statusbar_get_type @@ -2575,6 +2627,7 @@ gtk_stock_item_free gtk_stock_list_ids gtk_stock_lookup gtk_stock_set_translate_func +gtk_switch_accessible_get_type gtk_switch_get_active gtk_switch_get_type gtk_switch_new @@ -2833,6 +2886,7 @@ gtk_text_buffer_target_info_get_type gtk_text_buffer_unregister_deserialize_format gtk_text_buffer_unregister_serialize_format gtk_text_byte_begins_utf8_char +gtk_text_cell_accessible_get_type gtk_text_child_anchor_get_deleted gtk_text_child_anchor_get_type gtk_text_child_anchor_get_widgets @@ -3001,6 +3055,7 @@ gtk_text_tag_table_lookup gtk_text_tag_table_new gtk_text_tag_table_remove gtk_text_unknown_char_utf8_gtk_tests_only +gtk_text_view_accessible_get_type gtk_text_view_add_child_at_anchor gtk_text_view_add_child_in_window gtk_text_view_backward_display_line @@ -3102,6 +3157,7 @@ gtk_toggle_action_new gtk_toggle_action_set_active gtk_toggle_action_set_draw_as_radio gtk_toggle_action_toggled +gtk_toggle_button_accessible_get_type gtk_toggle_button_get_active gtk_toggle_button_get_inconsistent gtk_toggle_button_get_mode @@ -3243,6 +3299,8 @@ gtk_tooltip_set_markup gtk_tooltip_set_text gtk_tooltip_set_tip_area gtk_tooltip_trigger_tooltip_query +gtk_toplevel_accessible_get_children +gtk_toplevel_accessible_get_type #ifdef GDK_WINDOWING_X11 gtk_tray_icon_get_type #endif @@ -3391,6 +3449,7 @@ gtk_tree_store_set_valist gtk_tree_store_set_value gtk_tree_store_set_valuesv gtk_tree_store_swap +gtk_tree_view_accessible_get_type gtk_tree_view_append_column gtk_tree_view_collapse_all gtk_tree_view_collapse_row @@ -3595,6 +3654,7 @@ gtk_vscrollbar_get_type gtk_vscrollbar_new gtk_vseparator_get_type gtk_vseparator_new +gtk_widget_accessible_get_type gtk_widget_activate gtk_widget_add_accelerator gtk_widget_add_device_events @@ -3850,6 +3910,7 @@ gtk_widget_insert_action_group #ifdef GDK_WINDOWING_WIN32 gtk_win32_embed_widget_get_type #endif +gtk_window_accessible_get_type gtk_window_activate_default gtk_window_activate_focus gtk_window_activate_key diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index b7c8946102..f34f883a8e 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -44,7 +44,7 @@ #include "gtktreednd.h" #include "gtktypebuiltins.h" #include "gtkprivate.h" -#include "a11y/gtkiconviewaccessible.h" +#include "a11y/gtkiconviewaccessibleprivate.h" /** * SECTION:gtkiconview @@ -2816,7 +2816,7 @@ gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment, if (icon_view->priv->doing_rubberband) gtk_icon_view_update_rubberband (GTK_WIDGET (icon_view)); - + _gtk_icon_view_accessible_adjustment_changed (icon_view); } } diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c index 6121adef23..962b4a947d 100644 --- a/gtk/gtklockbutton.c +++ b/gtk/gtklockbutton.c @@ -24,7 +24,7 @@ #include "gtklabel.h" #include "gtksizegroup.h" #include "gtkintl.h" -#include "a11y/gtklockbuttonaccessible.h" +#include "a11y/gtklockbuttonaccessibleprivate.h" /** * SECTION:gtklockbutton diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 585eaa4ad3..d1b4c809c0 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -54,7 +54,7 @@ #include "gtkstylecontextprivate.h" #include "gtkcssstylepropertyprivate.h" -#include "a11y/gtktextviewaccessible.h" +#include "a11y/gtktextviewaccessibleprivate.h" /** * SECTION:gtktextview diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index ec40a1b27d..10c9cd717a 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -23,7 +23,7 @@ #include "gtkmarshalers.h" #include "gtkintl.h" #include "gtktypebuiltins.h" -#include "a11y/gtktreeviewaccessible.h" +#include "a11y/gtktreeviewaccessibleprivate.h" /** diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index a2a20b0d5c..a5b8afb049 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -53,7 +53,7 @@ #include "gtkmain.h" #include "gtksettings.h" #include "gtkwidgetpath.h" -#include "a11y/gtktreeviewaccessible.h" +#include "a11y/gtktreeviewaccessibleprivate.h" /** diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index c9c0be5780..cde429f91a 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -35,7 +35,7 @@ #include "gtkprivate.h" #include "gtkintl.h" #include "gtktypebuiltins.h" -#include "a11y/gtktreeviewaccessible.h" +#include "a11y/gtktreeviewaccessibleprivate.h" /** |