X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk%2Fatkutil.h;h=d69df88fed5f00144aaa732cd89a3f7f0abfa90d;hb=c5ee728c20b2d04aa69f21feefcbdd8c6ca0ba36;hp=20eddc8625ee96451419c7b07ccb2f3beb6be669;hpb=2b6504ef3a8eb22b4d00c933e041fe2e1423142a;p=platform%2Fupstream%2Fatk.git

diff --git a/atk/atkutil.h b/atk/atkutil.h
old mode 100755
new mode 100644
index 20eddc8..d69df88
--- a/atk/atkutil.h
+++ b/atk/atkutil.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_UTIL_H__
+#define __ATK_UTIL_H__
+
 #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_UTIL_H__
-#define __ATK_UTIL_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS
@@ -71,7 +71,7 @@ typedef void  (*AtkEventListenerInit) (void);
  * AtkKeySnoopFunc:
  * @event: an AtkKeyEventStruct containing information about the key event for which
  * notification is being given.
- * @func_data: a block of data which will be passed to the event listener, on notification.
+ * @user_data: a block of data which will be passed to the event listener, on notification.
  *
  * An #AtkKeySnoopFunc is a type of callback which is called whenever a key event occurs, 
  * if registered via atk_add_key_event_listener.  It allows for pre-emptive 
@@ -84,7 +84,7 @@ typedef void  (*AtkEventListenerInit) (void);
  * see atk_add_key_event_listener.
  **/
 typedef gint  (*AtkKeySnoopFunc)  (AtkKeyEventStruct *event,
-				   gpointer func_data);
+				   gpointer user_data);
 
 /**
  * AtkKeyEventStruct:
@@ -137,6 +137,26 @@ struct _AtkUtil
   GObject parent;
 };
 
+/**
+ * AtkUtilClass:
+ * @add_global_event_listener: adds the specified function to the list
+ *  of functions to be called when an ATK event occurs. ATK
+ *  implementors are discouraged from reimplementing this method.
+ * @remove_global_event_listener: removes the specified function to
+ *  the list of functions to be called when an ATK event occurs. ATK
+ *  implementors are discouraged from reimplementing this method.
+ * @add_key_event_listener: adds the specified function to the list of
+ *  functions to be called when a key event occurs.
+ * @remove_key_event_listener: remove the specified function to the
+ *  list of functions to be called when a key event occurs.
+ * @get_root: gets the root accessible container for the current
+ *  application.
+ * @get_toolkit_name: gets name string for the GUI toolkit
+ *  implementing ATK for this application.
+ * @get_toolkit_version: gets version string for the GUI toolkit
+ *  implementing ATK for this application.
+ *
+ */
 struct _AtkUtilClass
 {
    GObjectClass parent;
@@ -150,6 +170,7 @@ struct _AtkUtilClass
    const gchar* (* get_toolkit_name)             (void);
    const gchar* (* get_toolkit_version)          (void);
 };
+ATK_AVAILABLE_IN_ALL
 GType atk_util_get_type (void);
 
 /**
@@ -166,79 +187,34 @@ typedef enum {
   ATK_XY_WINDOW
 }AtkCoordType;
 
-/*
- * Adds the specified function to the list of functions to be called
- * when an object receives focus.
- */
+ATK_DEPRECATED_IN_2_10
 guint    atk_add_focus_tracker     (AtkEventListener      focus_tracker);
-
-/*
- * Removes the specified focus tracker from the list of function
- * to be called when any object receives focus
- */
+ATK_DEPRECATED_IN_2_10
 void     atk_remove_focus_tracker  (guint                tracker_id);
-
-/*
- * atk_focus_tracker_init:
- * @init: An #AtkEventListenerInit function to be called
- * prior to any focus-tracking requests.
- *
- * Specifies the function to be called for focus tracker initialization.
- * removal. This function should be called by an implementation of the
- * ATK interface if any specific work needs to be done to enable
- * focus tracking.
- */
+ATK_DEPRECATED_IN_2_10
 void     atk_focus_tracker_init    (AtkEventListenerInit  init);
-
-/*
- * Cause the focus tracker functions which have been specified to be
- * executed for the object.
- */
+ATK_DEPRECATED_IN_2_10
 void     atk_focus_tracker_notify  (AtkObject            *object);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an event of type event_type occurs.
- */
+ATK_AVAILABLE_IN_ALL
 guint	atk_add_global_event_listener (GSignalEmissionHook listener,
 				       const gchar        *event_type);
-
-/*
- * Removes the specified event listener
- */
+ATK_AVAILABLE_IN_ALL
 void	atk_remove_global_event_listener (guint listener_id);
-
-/*
- * Adds the specified function to the list of functions to be called
- * when an keyboard event occurs.
- */
+ATK_AVAILABLE_IN_ALL
 guint	atk_add_key_event_listener (AtkKeySnoopFunc listener, gpointer data);
-
-/*
- * Removes the specified event listener
- */
+ATK_AVAILABLE_IN_ALL
 void	atk_remove_key_event_listener (guint listener_id);
 
-/*
- * Returns the root accessible container for the current application.
- */
+ATK_AVAILABLE_IN_ALL
 AtkObject* atk_get_root(void);
-
+ATK_AVAILABLE_IN_ALL
 AtkObject* atk_get_focus_object (void);
 
-/*
- * Returns name string for the GUI toolkit.
- */
+ATK_AVAILABLE_IN_ALL
 const gchar *atk_get_toolkit_name (void);
-
-/*
- * Returns version string for the GUI toolkit.
- */
+ATK_AVAILABLE_IN_ALL
 const gchar *atk_get_toolkit_version (void);
-
-/*
- * Gets the current version of ATK
- */
+ATK_AVAILABLE_IN_ALL
 const gchar *atk_get_version (void);
 
 /* --- GType boilerplate --- */
@@ -339,6 +315,7 @@ static void     type_name##_class_intern_init (gpointer klass) \
   type_name##_class_init ((TypeName##Class*) klass); \
 } \
 \
+ATK_AVAILABLE_IN_ALL \
 GType \
 type_name##_get_type (void) \
 { \