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

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

diff --git a/atk/atktable.h b/atk/atktable.h
index e17e51e..388f1b8 100755 (executable)
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -17,20 +17,16 @@
  * 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_TABLE_H__
 #define __ATK_TABLE_H__
 
 #include <atk/atkobject.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * AtkTable describes a user-interface component that presents data in
- * two-dimensional table format.
- */
-
+G_BEGIN_DECLS
 
 #define ATK_TYPE_TABLE                    (atk_table_get_type ())
 #define ATK_IS_TABLE(obj)                 G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_TABLE)
@@ -54,9 +50,9 @@ struct _AtkTableIface
                                                   gint          row,
                                                   gint          column);
   gint              (* get_column_at_index)      (AtkTable      *table,
-                                                  gint          index);
+                                                  gint          index_);
   gint              (* get_row_at_index)         (AtkTable      *table,
-                                                  gint          index);
+                                                  gint          index_);
   gint              (* get_n_columns)           (AtkTable      *table);
   gint              (* get_n_rows)               (AtkTable      *table);
   gint              (* get_column_extent_at)     (AtkTable      *table,
@@ -65,21 +61,19 @@ struct _AtkTableIface
   gint              (* get_row_extent_at)        (AtkTable      *table,
                                                   gint          row,
                                                   gint          column);
-  G_CONST_RETURN gchar*
+  AtkObject*
                     (* get_caption)              (AtkTable      *table);
-  G_CONST_RETURN gchar*
-                    (* get_column_description)   (AtkTable      *table,
+  const gchar*      (* get_column_description)   (AtkTable      *table,
                                                   gint          column);
   AtkObject*        (* get_column_header)        (AtkTable      *table,
                                                  gint          column);
-  G_CONST_RETURN gchar*
-                    (* get_row_description)      (AtkTable      *table,
+  const gchar*      (* get_row_description)      (AtkTable      *table,
                                                   gint          row);
   AtkObject*        (* get_row_header)           (AtkTable      *table,
                                                  gint          row);
   AtkObject*        (* get_summary)              (AtkTable      *table);
   void              (* set_caption)              (AtkTable      *table,
-                                                  const gchar   *caption);
+                                                  AtkObject     *caption);
   void              (* set_column_description)   (AtkTable      *table,
                                                   gint          column,
                                                   const gchar   *description);
@@ -131,82 +125,109 @@ struct _AtkTableIface
                                                   gint          num_deleted);
   void              (* row_reordered)            (AtkTable      *table);
   void              (* column_reordered)         (AtkTable      *table);
+  void              (* model_changed)            (AtkTable      *table);
 };
 
-GType atk_table_get_type ();
+ATK_AVAILABLE_IN_ALL
+GType atk_table_get_type (void);
 
+ATK_AVAILABLE_IN_ALL
 AtkObject*        atk_table_ref_at               (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+ATK_DEPRECATED_IN_2_12_FOR(atk_table_ref_at)
 gint              atk_table_get_index_at         (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+ATK_DEPRECATED_IN_2_12
 gint              atk_table_get_column_at_index  (AtkTable         *table,
-                                                  gint             index);
+                                                  gint             index_);
+ATK_DEPRECATED_IN_2_12
 gint              atk_table_get_row_at_index     (AtkTable         *table,
-                                                  gint             index);
+                                                  gint             index_);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_n_columns        (AtkTable         *table);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_n_rows           (AtkTable         *table);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_column_extent_at (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_row_extent_at    (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
-G_CONST_RETURN gchar*
+ATK_AVAILABLE_IN_ALL
+AtkObject*
                   atk_table_get_caption          (AtkTable         *table);
-G_CONST_RETURN gchar*
-                  atk_table_get_column_description (AtkTable         *table,
+ATK_AVAILABLE_IN_ALL
+const gchar*      atk_table_get_column_description
+                                                 (AtkTable         *table,
                                                   gint             column);
+ATK_AVAILABLE_IN_ALL
 AtkObject*        atk_table_get_column_header    (AtkTable         *table,
                                                  gint             column);
-G_CONST_RETURN gchar*
-                  atk_table_get_row_description  (AtkTable         *table,
+ATK_AVAILABLE_IN_ALL
+const gchar*      atk_table_get_row_description  (AtkTable         *table,
                                                   gint             row);
+ATK_AVAILABLE_IN_ALL
 AtkObject*        atk_table_get_row_header       (AtkTable         *table,
                                                  gint             row);
+ATK_AVAILABLE_IN_ALL
 AtkObject*        atk_table_get_summary          (AtkTable         *table);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_caption          (AtkTable         *table,
-                                                  const gchar      *caption);
+                                                  AtkObject        *caption);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_column_description 
                                                  (AtkTable         *table,
                                                   gint             column,
                                                   const gchar      *description);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_column_header    (AtkTable         *table,
                                                   gint             column,
                                                   AtkObject        *header);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_row_description  (AtkTable         *table,
                                                   gint             row,
                                                   const gchar      *description);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_row_header       (AtkTable         *table,
                                                   gint             row,
                                                   AtkObject        *header);
+ATK_AVAILABLE_IN_ALL
 void              atk_table_set_summary          (AtkTable         *table,
                                                   AtkObject        *accessible);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_selected_columns (AtkTable         *table,
                                                   gint             **selected);
+ATK_AVAILABLE_IN_ALL
 gint              atk_table_get_selected_rows    (AtkTable         *table,
                                                   gint             **selected);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_is_column_selected   (AtkTable         *table,
                                                   gint             column);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_is_row_selected      (AtkTable         *table,
                                                   gint             row);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_is_selected          (AtkTable         *table,
                                                   gint             row,
                                                   gint             column);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_add_row_selection    (AtkTable         *table,
                                                   gint             row);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_remove_row_selection (AtkTable         *table,
                                                   gint             row);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_add_column_selection (AtkTable         *table,
                                                   gint             column);
+ATK_AVAILABLE_IN_ALL
 gboolean          atk_table_remove_column_selection  
                                                  (AtkTable         *table,
                                                   gint             column);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __ATK_TABLE_H__ */