Translation updated by Ivar Smolin.

[~andy/gtk] / gtk / gtktextlayout.h

diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index 58e8e97c4580fdbad4fc68ffc0ae361400b3a8d7..21e3d53e124701f1c030093ded40c0406cd6721a 100644 (file)
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -76,12 +76,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_LAYOUT_H
-#define GTK_TEXT_LAYOUT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#ifndef __GTK_TEXT_LAYOUT_H__
+#define __GTK_TEXT_LAYOUT_H__
 
 /* This is a "semi-private" header; it is intended for
  * use by the text widget, and the text canvas item,
@@ -96,6 +92,8 @@ extern "C" {
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextiter.h>
 
+G_BEGIN_DECLS
+
 /* forward declarations that have to be here to avoid including
  * gtktextbtree.h
  */
@@ -165,6 +163,11 @@ struct _GtkTextLayout
    */
   guint cursor_direction : 2;
 
+  /* The keyboard direction is used to default the alignment when
+     there are no strong characters.
+  */
+  guint keyboard_direction : 2;
+
   /* The preedit string and attributes, if any */
 
   gchar *preedit_string;
@@ -230,7 +233,7 @@ struct _GtkTextLineDisplay
 {
   PangoLayout *layout;
   GSList *cursors;
-  GSList *shaped_objects;
+  GSList *shaped_objects;      /* Only for backwards compatibility */
   
   GtkTextDirection direction;
 
@@ -249,6 +252,8 @@ struct _GtkTextLineDisplay
 
   gboolean size_only;
   GtkTextLine *line;
+  
+  GdkColor *pg_bg_color;
 };
 
 extern PangoAttrType gtk_text_attr_appearance_type;
@@ -265,7 +270,9 @@ void               gtk_text_layout_set_contexts          (GtkTextLayout     *lay
                                                          PangoContext      *ltr_context,
                                                          PangoContext      *rtl_context);
 void               gtk_text_layout_set_cursor_direction  (GtkTextLayout     *layout,
-                                                         GtkTextDirection   direction);
+                                                          GtkTextDirection   direction);
+void               gtk_text_layout_set_keyboard_direction (GtkTextLayout     *layout,
+                                                          GtkTextDirection keyboard_dir);
 void               gtk_text_layout_default_style_changed (GtkTextLayout     *layout);
 
 void gtk_text_layout_set_screen_width       (GtkTextLayout     *layout,
@@ -312,6 +319,11 @@ void gtk_text_layout_get_iter_at_pixel (GtkTextLayout     *layout,
                                         GtkTextIter       *iter,
                                         gint               x,
                                         gint               y);
+void gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
+                                          GtkTextIter       *iter,
+                                          gint              *trailing,
+                                          gint               x,
+                                          gint               y);
 void gtk_text_layout_invalidate        (GtkTextLayout     *layout,
                                         const GtkTextIter *start,
                                         const GtkTextIter *end);
@@ -402,8 +414,6 @@ void gtk_text_anchored_child_set_layout     (GtkWidget          *child,
 
 void gtk_text_layout_spew (GtkTextLayout *layout);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif  /* GTK_TEXT_LAYOUT_H */
+#endif  /* __GTK_TEXT_LAYOUT_H__ */