projects
/
platform
/
upstream
/
atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...
[platform/upstream/atk.git]
/
atk
/
atkaction.h
diff --git
a/atk/atkaction.h
b/atk/atkaction.h
index
8dfee9f
..
3712806
100755
(executable)
--- a/
atk/atkaction.h
+++ b/
atk/atkaction.h
@@
-17,14
+17,16
@@
* Boston, MA 02111-1307, USA.
*/
* 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>
#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
/*
* The interface AtkAction should be supported by any object that can
@@
-53,20
+55,20
@@
struct _AtkActionIface
gboolean (*do_action) (AtkAction *action,
gint i);
gint (*get_n_actions) (AtkAction *action);
gboolean (*do_action) (AtkAction *action,
gint i);
gint (*get_n_actions) (AtkAction *action);
-
G_CONST_RETURN gchar*
(*get_description) (AtkAction *action,
+
const gchar*
(*get_description) (AtkAction *action,
gint i);
gint i);
-
G_CONST_RETURN gchar*
(*get_name) (AtkAction *action,
+
const gchar*
(*get_name) (AtkAction *action,
gint i);
gint i);
-
G_CONST_RETURN gchar*
(*get_keybinding) (AtkAction *action,
+
const gchar*
(*get_keybinding) (AtkAction *action,
gint i);
gboolean (*set_description) (AtkAction *action,
gint i,
const gchar *desc);
gint i);
gboolean (*set_description) (AtkAction *action,
gint i,
const gchar *desc);
-
G_CONST_RETURN gchar*
(*get_localized_name)(AtkAction *action,
+
const gchar*
(*get_localized_name)(AtkAction *action,
gint i);
gint i);
- AtkFunction pad2;
};
};
+ATK_AVAILABLE_IN_ALL
GType atk_action_get_type (void);
/*
GType atk_action_get_type (void);
/*
@@
-80,22
+82,28
@@
GType atk_action_get_type (void);
* provided in a support library
*/
* provided in a support library
*/
+ATK_AVAILABLE_IN_ALL
gboolean atk_action_do_action (AtkAction *action,
gint i);
gboolean atk_action_do_action (AtkAction *action,
gint i);
+ATK_AVAILABLE_IN_ALL
gint atk_action_get_n_actions (AtkAction *action);
gint atk_action_get_n_actions (AtkAction *action);
-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
+ATK_AVAILABLE_IN_ALL
+const gchar* atk_action_get_description (AtkAction *action,
gint i);
gint i);
-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
+ATK_AVAILABLE_IN_ALL
+const gchar* atk_action_get_name (AtkAction *action,
gint i);
gint i);
-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
+ATK_AVAILABLE_IN_ALL
+const gchar* atk_action_get_keybinding (AtkAction *action,
gint i);
gint i);
+ATK_AVAILABLE_IN_ALL
gboolean atk_action_set_description (AtkAction *action,
gint i,
const gchar *desc);
/* NEW in ATK 1.1: */
gboolean atk_action_set_description (AtkAction *action,
gint i,
const gchar *desc);
/* NEW in ATK 1.1: */
-
-
G_CONST_RETURN
gchar* atk_action_get_localized_name (AtkAction *action,
+ATK_AVAILABLE_IN_ALL
+
const
gchar* atk_action_get_localized_name (AtkAction *action,
gint i);
/*
gint i);
/*
@@
-104,9
+112,6
@@
G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
* (an accessible action, or the list of actions, has changed)
*/
* (an accessible action, or the list of actions, has changed)
*/
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
#endif /* __ATK_ACTION_H__ */
#endif /* __ATK_ACTION_H__ */