filechooserbutton: In SELECT_FOLDER, when the selection is empty, show (None) in...

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

diff --git a/gtk/gtktextchildprivate.h b/gtk/gtktextchildprivate.h
index 99ce0410041b5989093030276a6ed16a4c4c23d1..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.
@@ -9,7 +9,7 @@
  * California, Sun Microsystems, Inc., and other parties.  The
  * following terms apply to all files associated with the software
  * unless explicitly disclaimed in individual files.
- * 
+ *
  * The authors hereby grant permission to use, copy, modify,
  * distribute, and license this software and its documentation for any
  * purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
  * software may be copyrighted by their authors and need not follow
  * the licensing terms described here, provided that the new terms are
  * clearly indicated on the first page of each file where they apply.
- * 
+ *
  * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
  * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
  * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
  * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,17 +44,15 @@
  * foregoing, the authors grant the U.S. Government and others acting
  * in its behalf permission to use and distribute the software in
  * accordance with the terms specified in this license.
- * 
+ *
  */
 
-#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;
 
@@ -63,28 +61,28 @@ struct _GtkTextPixbuf
   GdkPixbuf *pixbuf;
 };
 
-GtkTextLineSegment *_pixbuf_segment_new (GdkPixbuf *pixbuf);
+GtkTextLineSegment *_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf);
 
 typedef struct _GtkTextChildBody GtkTextChildBody;
 
 struct _GtkTextChildBody
 {
-  guint ref_count;
+  GtkTextChildAnchor *obj;
   GSList *widgets;
   GtkTextBTree *tree;
   GtkTextLine *line;
 };
 
-GtkTextLineSegment *_widget_segment_new    (void);
-void                _widget_segment_add    (GtkTextLineSegment *widget_segment,
-                                            GtkWidget          *child);
-void                _widget_segment_remove (GtkTextLineSegment *widget_segment,
-                                            GtkWidget          *child);
-void                _widget_segment_ref    (GtkTextLineSegment *widget_segment);
-void                _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);
+
+GtkTextLayout*      _gtk_anchored_child_get_layout (GtkWidget *child);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif