From db11c53d1b8259122c7ab6c0bfce9aae1378cae5 Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Fri, 15 Feb 2002 11:26:25 +0000 Subject: [PATCH] Change argument of get_layer and get_mdi_zorder function pointers to be * atk/atkcomponent.h: Change argument of get_layer and get_mdi_zorder function pointers to be AtkComponent instead of AtkObject * atk/atkcomponent.c: Change atk_component_get_layer and atk_component_get_mdi_zorder to refer to argument as component instead os accessible * docs/atk-sections.txt docs/tmpl/atkaction.sgml docs/tmpl/atkcomponent.sgml docs/tmpl/atkeditabletext.sgml docs/tmpl/atkimage.sgml docs/tmpl/atkobject.sgml docs/tmpl/atkselection.sgml docs/tmpl/atkstreamablecontent.sgml docs/tmpl/atktable.sgml docs/tmpl/atktext.sgml docs/tmpl/atkvalue.sgml: Update for recent changes --- ChangeLog | 17 +++++++++++++++++ atk/atkcomponent.c | 30 +++++++++++++++--------------- atk/atkcomponent.h | 4 ++-- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 850057c..253c6cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2002-02-15 Padraig O'Briain + * atk/atkcomponent.h: + Change argument of get_layer and get_mdi_zorder function pointers + to be AtkComponent instead of AtkObject + + * atk/atkcomponent.c: + Change atk_component_get_layer and atk_component_get_mdi_zorder + to refer to argument as component instead os accessible + + * docs/atk-sections.txt docs/tmpl/atkaction.sgml + docs/tmpl/atkcomponent.sgml docs/tmpl/atkeditabletext.sgml + docs/tmpl/atkimage.sgml docs/tmpl/atkobject.sgml + docs/tmpl/atkselection.sgml docs/tmpl/atkstreamablecontent.sgml + docs/tmpl/atktable.sgml docs/tmpl/atktext.sgml docs/tmpl/atkvalue.sgml: + Update for recent changes + +2002-02-15 Padraig O'Briain + * atk/atk.h: Guard atk.h with ifndef __ATK_H__ (#71405 reported by terra@diku.dk (Morten Welinder)) diff --git a/atk/atkcomponent.c b/atk/atkcomponent.c index 7ef5cc3..69ab3b9 100755 --- a/atk/atkcomponent.c +++ b/atk/atkcomponent.c @@ -319,47 +319,47 @@ atk_component_get_size (AtkComponent *component, /** * atk_component_get_layer: - * @accessible: an #AtkComponent + * @component: an #AtkComponent * - * Gets the layer of the accessible. + * Gets the layer of the component. * - * Returns: an #AtkLayer which is the layer of the accessible + * Returns: an #AtkLayer which is the layer of the component **/ AtkLayer -atk_component_get_layer (AtkComponent *accessible) +atk_component_get_layer (AtkComponent *component) { AtkComponentIface *iface; - g_return_val_if_fail (ATK_IS_COMPONENT (accessible), ATK_LAYER_INVALID); + g_return_val_if_fail (ATK_IS_COMPONENT (component), ATK_LAYER_INVALID); - iface = ATK_COMPONENT_GET_IFACE (accessible); + iface = ATK_COMPONENT_GET_IFACE (component); if (iface->get_layer) - return (iface->get_layer) (accessible); + return (iface->get_layer) (component); else return ATK_LAYER_WIDGET; } /** * atk_component_get_mdi_zorder: - * @accessible: an #AtkComponent + * @component: an #AtkComponent * - * Gets the zorder of the accessible. The value G_MININT will be returned - * if the layer of the accessible is not ATK_LAYER_MDI. + * Gets the zorder of the component. The value G_MININT will be returned + * if the layer of the component is not ATK_LAYER_MDI. * - * Returns: a gint which is the zorder of the accessible, i.e. the depth at + * Returns: a gint which is the zorder of the component, i.e. the depth at * which the component is shown in relation to other components in the same * container. **/ gint -atk_component_get_mdi_zorder (AtkComponent *accessible) +atk_component_get_mdi_zorder (AtkComponent *component) { AtkComponentIface *iface; - g_return_val_if_fail (ATK_IS_COMPONENT (accessible), G_MININT); + g_return_val_if_fail (ATK_IS_COMPONENT (component), G_MININT); - iface = ATK_COMPONENT_GET_IFACE (accessible); + iface = ATK_COMPONENT_GET_IFACE (component); if (iface->get_mdi_zorder) - return (iface->get_mdi_zorder) (accessible); + return (iface->get_mdi_zorder) (component); else return G_MININT; } diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h index c089150..b551cd4 100755 --- a/atk/atkcomponent.h +++ b/atk/atkcomponent.h @@ -93,8 +93,8 @@ struct _AtkComponentIface gint width, gint height); - AtkLayer (* get_layer) (AtkObject *accessible); - gint (* get_mdi_zorder) (AtkObject *accessible); + AtkLayer (* get_layer) (AtkComponent *component); + gint (* get_mdi_zorder) (AtkComponent *component); AtkFunction pad1; AtkFunction pad2; -- 2.11.4.GIT