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

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

diff --git a/atk/atkaction.h b/atk/atkaction.h
index d14b736..6991ab5 100755 (executable)
--- a/atk/atkaction.h
+++ b/atk/atkaction.h
@@ -17,19 +17,21 @@
  * 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_ACTION_H__
 #define __ATK_ACTION_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * The interface AtkAction should be supported by any object that can 
  * perform one or more actions. The interface provides the standard 
- * mechanism for an assitive technology to determine what those actions 
+ * mechanism for an assistive technology to determine what those actions 
  * are as well as tell the object to perform them. Any object that can 
  * be manipulated should support this interface.
  */
@@ -50,16 +52,23 @@ struct _AtkActionIface
 {
   GTypeInterface parent;
 
-  gboolean (*do_action)         (AtkAction         *action,
-                                 gint              i);
-  gint     (*get_n_actions)     (AtkAction         *action);
-  G_CONST_RETURN gchar*   (*get_description)   (AtkAction         *action,
+  gboolean                (*do_action)         (AtkAction         *action,
                                                 gint              i);
-  G_CONST_RETURN gchar*   (*get_keybinding)    (AtkAction         *action,
+  gint                    (*get_n_actions)     (AtkAction         *action);
+  const gchar*            (*get_description)   (AtkAction         *action,
                                                 gint              i);
-
+  const gchar*            (*get_name)          (AtkAction         *action,
+                                                gint              i);
+  const gchar*            (*get_keybinding)    (AtkAction         *action,
+                                                gint              i);
+  gboolean                (*set_description)   (AtkAction         *action,
+                                                gint              i,
+                                                const gchar       *desc);
+  const gchar*            (*get_localized_name)(AtkAction         *action,
+                                               gint              i);
 };
-GType atk_action_get_type ();
+
+GType atk_action_get_type (void);
 
 /*
  * These are the function which would be called by an application with
@@ -72,14 +81,23 @@ GType atk_action_get_type ();
  * provided in a support library
  */
 
-void   atk_action_do_action                (AtkAction         *action,
+gboolean   atk_action_do_action                (AtkAction         *action,
                                             gint              i);
 gint   atk_action_get_n_actions            (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description  (AtkAction         *action,
+const gchar*          atk_action_get_description  (AtkAction         *action,
+                                                   gint              i);
+const gchar*          atk_action_get_name         (AtkAction         *action,
                                                    gint              i);
-G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
+const gchar*          atk_action_get_keybinding   (AtkAction         *action,
                                                    gint              i);
+gboolean              atk_action_set_description  (AtkAction         *action,
+                                                   gint              i,
+                                                   const gchar       *desc);
 
+/* NEW in ATK 1.1: */
+
+const gchar* atk_action_get_localized_name (AtkAction       *action,
+                                                    gint            i);
 
 /*
  * Additional GObject properties exported by AtkAction:
@@ -87,9 +105,6 @@ G_CONST_RETURN gchar* atk_action_get_keybinding   (AtkAction         *action,
  *       (an accessible action, or the list of actions, has changed)
  */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_ACTION_H__ */