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

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

diff --git a/atk/atkeditabletext.h b/atk/atkeditabletext.h
index 46ce9e5..0849595 100755 (executable)
--- a/atk/atkeditabletext.h
+++ b/atk/atkeditabletext.h
@@ -17,15 +17,17 @@
  * 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_EDITABLE_TEXT_H__
 #define __ATK_EDITABLE_TEXT_H__
 
-#include <pango/pango.h>
 #include <atk/atkobject.h>
+#include <atk/atktext.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * AtkEditableText is used to support access in an "accessibility" context
@@ -47,13 +49,10 @@ struct _AtkEditableTextIface
 {
   GTypeInterface parent_interface;
 
-  void   (* select_text)          (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos);
-  void   (* set_attributes)       (AtkEditableText  *text,
-                                   gint             start_pos,
-                                   gint             end_pos,
-                                   PangoAttrList    *attributes);
+  gboolean (* set_run_attributes) (AtkEditableText  *text,
+                                   AtkAttributeSet  *attrib_set,
+                                   gint                    start_offset,
+                                  gint             end_offset);
   void   (* set_text_contents)    (AtkEditableText  *text,
                                    const gchar      *string);
   void   (* insert_text)          (AtkEditableText  *text,
@@ -74,13 +73,11 @@ struct _AtkEditableTextIface
 };
 GType atk_editable_text_get_type (void);
 
-void atk_editable_text_select_text          (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos);
-void atk_editable_text_set_attributes       (AtkEditableText  *text,
-                                             gint             start_pos,
-                                             gint             end_pos,
-                                             PangoAttrList    *attributes);
+
+gboolean atk_editable_text_set_run_attributes (AtkEditableText          *text,
+                                               AtkAttributeSet  *attrib_set,
+                                               gint                    start_offset,
+                                              gint             end_offset);
 void atk_editable_text_set_text_contents    (AtkEditableText  *text,
                                              const gchar      *string);
 void atk_editable_text_insert_text          (AtkEditableText  *text,
@@ -98,10 +95,7 @@ void atk_editable_text_delete_text          (AtkEditableText  *text,
                                              gint             end_pos);
 void atk_editable_text_paste_text           (AtkEditableText  *text,
                                              gint             position);
- 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
+G_END_DECLS
 
 #endif /* __ATK_EDITABLE_TEXT_H__ */