Use the correct screen for getting the height. (Fix from Stephen Browne,

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

diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h
index 08b64fac003a6c22cef600ba1cdf6b22823ac7ac..425b516919c785df5ce74beca6e046243ca4eefb 100644 (file)
--- a/gtk/gtktextmarkprivate.h
+++ b/gtk/gtktextmarkprivate.h
@@ -1,13 +1,14 @@
 #ifndef GTK_TEXT_MARK_PRIVATE_H
 #define GTK_TEXT_MARK_PRIVATE_H
 
-#include <gtk/gtktexttypes.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#define GTK_IS_TEXT_MARK(mark) (((GtkTextLineSegment*)mark)->type == &gtk_text_left_mark_type || \
+#include <gtk/gtktexttypes.h>
+#include <gtk/gtktextlayout.h>
+
+#define GTK_IS_TEXT_MARK_SEGMENT(mark) (((GtkTextLineSegment*)mark)->type == &gtk_text_left_mark_type || \
                                 ((GtkTextLineSegment*)mark)->type == &gtk_text_right_mark_type)
 
 /*
@@ -16,7 +17,7 @@ extern "C" {
  */
 
 struct _GtkTextMarkBody {
-  guint refcount;
+  GtkTextMark *obj;
   gchar *name;
   GtkTextBTree *tree;
   GtkTextLine *line;
@@ -24,12 +25,9 @@ struct _GtkTextMarkBody {
   guint not_deleteable : 1;
 };
 
-GtkTextLineSegment *mark_segment_new   (GtkTextBTree   *tree,
-                                        gboolean         left_gravity,
-                                        const gchar     *name);
-void             mark_segment_ref   (GtkTextLineSegment *mark);
-void             mark_segment_unref (GtkTextLineSegment *mark);
-
+GtkTextLineSegment *_gtk_mark_segment_new   (GtkTextBTree       *tree,
+                                             gboolean            left_gravity,
+                                             const gchar        *name);
 
 #ifdef __cplusplus
 }