Drop use of ATK_DISABLE_DEPRECATED guards in atk
authorAlejandro Piñeiro <apinheiro@igalia.com>
Wed, 7 Aug 2013 17:30:02 +0000 (19:30 +0200)
committerAlejandro Piñeiro <apinheiro@igalia.com>
Mon, 12 Aug 2013 19:06:04 +0000 (21:06 +0200)
Equivalent to gtk commit a78ab0cfa1d5e5e15d505bce0761a00708400ce3

atk/atkdocument.h
atk/atkhyperlink.h
atk/atkobject.h

index ee1ae43..7f11eb4 100755 (executable)
@@ -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);
index 2e8a529..c1bd0bf 100755 (executable)
@@ -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
 
index 35a936a..f50e77a 100755 (executable)
@@ -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);