Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...

[platform/upstream/atk.git] / atk / atkrelation.h

diff --git a/atk/atkrelation.h b/atk/atkrelation.h
index 08b0708..0c958fa 100755 (executable)
--- a/atk/atkrelation.h
+++ b/atk/atkrelation.h
@@ -17,15 +17,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
+#error "Only <atk/atk.h> can be included directly."
+#endif
+
 #ifndef __ATK_RELATION_H__
 #define __ATK_RELATION_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #include <glib-object.h>
 #include <atk/atkrelationtype.h>
+#include <atk/atkversion.h>
 
 /*
  * An AtkRelation describes a relation between the object and one or more 
@@ -56,33 +59,41 @@ struct _AtkRelationClass
   GObjectClass parent;
 };
 
+ATK_AVAILABLE_IN_ALL
 GType atk_relation_get_type (void);
 
+ATK_AVAILABLE_IN_ALL
 AtkRelationType       atk_relation_type_register      (const gchar     *name);
-G_CONST_RETURN gchar* atk_relation_type_get_name      (AtkRelationType type);
+ATK_AVAILABLE_IN_ALL
+const gchar*          atk_relation_type_get_name      (AtkRelationType type);
+ATK_AVAILABLE_IN_ALL
 AtkRelationType       atk_relation_type_for_name      (const gchar     *name);
 
 /*
  * Create a new relation for the specified key and the specified list
  * of targets.
  */
+ATK_AVAILABLE_IN_ALL
 AtkRelation*          atk_relation_new                (AtkObject       **targets,
                                                        gint            n_targets,
                                                        AtkRelationType relationship);
 /*
  * Returns the type of a relation.
  */
+ATK_AVAILABLE_IN_ALL
 AtkRelationType       atk_relation_get_relation_type  (AtkRelation     *relation);
 /*
  * Returns the target list of a relation.
  */
+ATK_AVAILABLE_IN_ALL
 GPtrArray*            atk_relation_get_target         (AtkRelation     *relation);
+ATK_AVAILABLE_IN_ALL
 void                  atk_relation_add_target         (AtkRelation     *relation,
                                                        AtkObject       *target);
-                
+ATK_AVAILABLE_IN_ALL
+gboolean              atk_relation_remove_target      (AtkRelation     *relation,
+                                                       AtkObject       *target);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __ATK_RELATION_H__ */