GtkIconTheme: fix regression from 0db32f0632ef4675bfcfc9ec201f7af157a48ab0

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

diff --git a/gtk/gtktextchildprivate.h b/gtk/gtktextchildprivate.h
index 8c19f07c082e70c66c3c276b55082942184362c7..0c9b19c141d900cd37001919f38c4be7d8b77734 100644 (file)
--- a/gtk/gtktextchildprivate.h
+++ b/gtk/gtktextchildprivate.h
@@ -1,4 +1,4 @@
-/* gtktextchild.c - child pixmaps and widgets
+/* gtktextchildprivate.h - child pixmaps and widgets
  *
  * Copyright (c) 1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -47,14 +47,12 @@
  *
  */
 
-#ifndef GTK_TEXT_CHILD_PRIVATE_H
-#define GTK_TEXT_CHILD_PRIVATE_H
+#ifndef __GTK_TEXT_CHILD_PRIVATE_H__
+#define __GTK_TEXT_CHILD_PRIVATE_H__
 
 #include <gtk/gtktexttypes.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef struct _GtkTextPixbuf GtkTextPixbuf;
 
@@ -69,22 +67,22 @@ typedef struct _GtkTextChildBody GtkTextChildBody;
 
 struct _GtkTextChildBody
 {
-  guint ref_count;
+  GtkTextChildAnchor *obj;
   GSList *widgets;
   GtkTextBTree *tree;
   GtkTextLine *line;
 };
 
-GtkTextLineSegment *_gtk_widget_segment_new    (void);
-void                _gtk_widget_segment_add    (GtkTextLineSegment *widget_segment,
-                                                GtkWidget          *child);
-void                _gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
-                                                GtkWidget          *child);
-void                _gtk_widget_segment_ref    (GtkTextLineSegment *widget_segment);
-void                _gtk_widget_segment_unref  (GtkTextLineSegment *widget_segment);
+GtkTextLineSegment *_gtk_widget_segment_new      (GtkTextChildAnchor *anchor);
+void                _gtk_widget_segment_add      (GtkTextLineSegment *widget_segment,
+                                                  GtkWidget          *child);
+void                _gtk_widget_segment_remove   (GtkTextLineSegment *widget_segment,
+                                                  GtkWidget          *child);
+void                _gtk_widget_segment_ref      (GtkTextLineSegment *widget_segment);
+void                _gtk_widget_segment_unref    (GtkTextLineSegment *widget_segment);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+GtkTextLayout*      _gtk_anchored_child_get_layout (GtkWidget *child);
+
+G_END_DECLS
 
 #endif