summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Piñeiro <apinheiro@igalia.com>2013-08-07 19:30:02 +0200
committerAlejandro Piñeiro <apinheiro@igalia.com>2013-08-12 21:06:04 +0200
commit683e70ccad6d13a0495925e2a652a487cecb5006 (patch)
treee29504e8734f837bf04adf9a618af5d0321d6138
parent840e63030289c57660e7c670cc2e9ec54387e47d (diff)
downloadatk-683e70ccad6d13a0495925e2a652a487cecb5006.tar.gz
Drop use of ATK_DISABLE_DEPRECATED guards in atk
Equivalent to gtk commit a78ab0cfa1d5e5e15d505bce0761a00708400ce3
-rwxr-xr-xatk/atkdocument.h4
-rwxr-xr-xatk/atkhyperlink.h3
-rwxr-xr-xatk/atkobject.h4
3 files changed, 5 insertions, 6 deletions
diff --git a/atk/atkdocument.h b/atk/atkdocument.h
index ee1ae43..7f11eb4 100755
--- a/atk/atkdocument.h
+++ b/atk/atkdocument.h
@@ -65,10 +65,10 @@ GType atk_document_get_type (void);
const gchar* atk_document_get_document_type (AtkDocument *document);
gpointer atk_document_get_document (AtkDocument *document);
-#ifndef ATK_DISABLE_DEPRECATED
+
G_DEPRECATED
const gchar* atk_document_get_locale (AtkDocument *document);
-#endif /* ATK_DISABLE_DEPRECATED */
+
AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
const gchar* atk_document_get_attribute_value (AtkDocument *document,
const gchar *attribute_name);
diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h
index 2e8a529..c1bd0bf 100755
--- a/atk/atkhyperlink.h
+++ b/atk/atkhyperlink.h
@@ -97,10 +97,9 @@ gboolean atk_hyperlink_is_valid (AtkHyperlink *link_);
gboolean atk_hyperlink_is_inline (AtkHyperlink *link_);
gint atk_hyperlink_get_n_anchors (AtkHyperlink *link_);
-#ifndef ATK_DISABLE_DEPRECATED
+
G_DEPRECATED
gboolean atk_hyperlink_is_selected_link (AtkHyperlink *link_);
-#endif /* ATK_DISABLE_DEPRECATED */
G_END_DECLS
diff --git a/atk/atkobject.h b/atk/atkobject.h
index 35a936a..f50e77a 100755
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -559,12 +559,12 @@ AtkObject* atk_object_ref_accessible_child (AtkObject *ac
gint i);
AtkRelationSet* atk_object_ref_relation_set (AtkObject *accessible);
AtkRole atk_object_get_role (AtkObject *accessible);
-#ifndef ATK_DISABLE_DEPRECATED
+
G_DEPRECATED_FOR(atk_component_get_layer)
AtkLayer atk_object_get_layer (AtkObject *accessible);
G_DEPRECATED_FOR(atk_component_get_mdi_zorder)
gint atk_object_get_mdi_zorder (AtkObject *accessible);
-#endif /* ATK_DISABLE_DEPRECATED */
+
AtkAttributeSet* atk_object_get_attributes (AtkObject *accessible);
AtkStateSet* atk_object_ref_state_set (AtkObject *accessible);
gint atk_object_get_index_in_parent (AtkObject *accessible);