gtk: Rename some private headers
authorMatthias Clasen <mclasen@redhat.com>
Thu, 6 Oct 2022 02:59:51 +0000 (22:59 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 6 Oct 2022 03:01:28 +0000 (23:01 -0400)
Improve the consistency of our private header
naming, by add 'private' to a bunch of them.

62 files changed:
gtk/a11y/gtkatspipango.c
gtk/a11y/gtkatspitext.c
gtk/a11y/gtkatspitextbuffer.c
gtk/gskpango.c
gtk/gskpango.h [deleted file]
gtk/gskpangoprivate.h [new file with mode: 0644]
gtk/gtkcssshadowvalue.c
gtk/gtkdragicon.c
gtk/gtkentry.c
gtk/gtkfilechooserwidget.c
gtk/gtkfilesystemmodel.c
gtk/gtkinscription.c
gtk/gtklabel.c
gtk/gtkliststore.c
gtk/gtkpango.c
gtk/gtkpango.h [deleted file]
gtk/gtkpangoprivate.h [new file with mode: 0644]
gtk/gtkpathbar.c
gtk/gtkpathbar.h [deleted file]
gtk/gtkpathbarprivate.h [new file with mode: 0644]
gtk/gtkplacessidebar.c
gtk/gtksnapshot.c
gtk/gtktext.c
gtk/gtktextattributes.c
gtk/gtktextattributes.h [deleted file]
gtk/gtktextattributesprivate.h [new file with mode: 0644]
gtk/gtktextbtree.c
gtk/gtktextbtree.h [deleted file]
gtk/gtktextbtreeprivate.h [new file with mode: 0644]
gtk/gtktextbuffer.c
gtk/gtktextbufferprivate.h
gtk/gtktextchild.c
gtk/gtktextchildprivate.h
gtk/gtktextiter.c
gtk/gtktextiterprivate.h
gtk/gtktextlayout.c
gtk/gtktextlayoutprivate.h
gtk/gtktextlinedisplaycache.c
gtk/gtktextmark.c
gtk/gtktextmarkprivate.h
gtk/gtktextsegment.c
gtk/gtktextsegment.h [deleted file]
gtk/gtktextsegmentprivate.h [new file with mode: 0644]
gtk/gtktexttag.c
gtk/gtktexttagprivate.h
gtk/gtktexttypes.c
gtk/gtktexttypes.h [deleted file]
gtk/gtktexttypesprivate.h [new file with mode: 0644]
gtk/gtktextutil.c
gtk/gtktextutil.h [deleted file]
gtk/gtktextutilprivate.h [new file with mode: 0644]
gtk/gtktextview.c
gtk/gtktextviewprivate.h
gtk/gtktrashmonitor.c
gtk/gtktrashmonitor.h [deleted file]
gtk/gtktrashmonitorprivate.h [new file with mode: 0644]
gtk/gtktreedatalist.c
gtk/gtktreedatalist.h [deleted file]
gtk/gtktreedatalistprivate.h [new file with mode: 0644]
gtk/gtktreemodelsort.c
gtk/gtktreestore.c
testsuite/gtk/textbuffer.c

index f0f3ed746fc7abf959b5110177c00a9ac7a50d6e..2ca7bd419bd410b5da783c7a94b6ea2a98649c48 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "gtkatspipangoprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 
 void
 gtk_pango_get_font_attributes (PangoFontDescription *font,
index 1e6c8c5ae76c84b65db9dbc402e256406ba7de97..efd588a8b2020a5a518e3e50648b66aa8e0f96ab 100644 (file)
@@ -35,7 +35,7 @@
 #include "gtkentryprivate.h"
 #include "gtkinscriptionprivate.h"
 #include "gtklabelprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpasswordentryprivate.h"
 #include "gtksearchentryprivate.h"
 #include "gtkspinbuttonprivate.h"
index bb8869db6235b1e9cc20ad3b72d70e55b0977666..81afecab2c6207055a547ac276733af62a63931f 100644 (file)
@@ -21,7 +21,7 @@
 #include "gtkatspipangoprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextviewprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 
 void
 gtk_text_view_add_default_attributes (GtkTextView     *view,
index e96c84a2fc64de155bd86d409acee1776fd760c7..41a4b1a7bc8a8f501fc14b70e1d146ba03ef4a2a 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "gsk/gsk.h"
 #include "gsk/gskrendernodeprivate.h"
-#include "gskpango.h"
+#include "gskpangoprivate.h"
 #include "gtksnapshotprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtktextviewprivate.h"
diff --git a/gtk/gskpango.h b/gtk/gskpango.h
deleted file mode 100644 (file)
index 672128d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/* GSK - The GTK Scene Kit
- *
- * Copyright 2017 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GSK_PANGO_H__
-#define __GSK_PANGO_H__
-
-#include <pango/pango.h>
-#include "gtk/gtksnapshot.h"
-
-G_BEGIN_DECLS
-
-#define GSK_TYPE_PANGO_RENDERER            (gsk_pango_renderer_get_type ())
-#define GSK_PANGO_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRenderer))
-#define GSK_IS_PANGO_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSK_TYPE_PANGO_RENDERER))
-#define GSK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
-#define GSK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSK_TYPE_PANGO_RENDERER))
-#define GSK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
-
-typedef struct _GskPangoRenderer      GskPangoRenderer;
-typedef struct _GskPangoRendererClass GskPangoRendererClass;
-
-typedef enum
-{
-  GSK_PANGO_RENDERER_NORMAL,
-  GSK_PANGO_RENDERER_SELECTED,
-  GSK_PANGO_RENDERER_CURSOR
-} GskPangoRendererState;
-
-typedef gboolean (*GskPangoShapeHandler) (PangoAttrShape         *attr,
-                                          GdkSnapshot            *snapshot,
-                                          double                  width,
-                                          double                  height);
-
-/*
- * This is a PangoRenderer implementation that translates all the draw calls to
- * gsk render nodes, using the GtkSnapshot helper class. Glyphs are translated
- * to text nodes, other draw calls may fall back to cairo nodes.
- */
-
-struct _GskPangoRenderer
-{
-  PangoRenderer          parent_instance;
-
-  GtkWidget             *widget;
-  GtkSnapshot           *snapshot;
-  const GdkRGBA         *fg_color;
-
-  /* Error underline color for this widget */
-  GdkRGBA               *error_color;
-
-  GskPangoRendererState  state;
-
-  guint                  is_cached_renderer : 1;
-
-  GskPangoShapeHandler   shape_handler;
-};
-
-struct _GskPangoRendererClass
-{
-  PangoRendererClass parent_class;
-};
-
-GType             gsk_pango_renderer_get_type  (void) G_GNUC_CONST;
-void              gsk_pango_renderer_set_state (GskPangoRenderer      *crenderer,
-                                                GskPangoRendererState  state);
-void              gsk_pango_renderer_set_shape_handler (GskPangoRenderer      *crenderer,
-                                                        GskPangoShapeHandler handler);
-GskPangoRenderer *gsk_pango_renderer_acquire   (void);
-void              gsk_pango_renderer_release   (GskPangoRenderer      *crenderer);
-
-G_END_DECLS
-
-#endif /* __GSK_PANGO_H__ */
diff --git a/gtk/gskpangoprivate.h b/gtk/gskpangoprivate.h
new file mode 100644 (file)
index 0000000..5641f9c
--- /dev/null
@@ -0,0 +1,88 @@
+/* GSK - The GTK Scene Kit
+ *
+ * Copyright 2017 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GSK_PANGO_PRIVATE_H__
+#define __GSK_PANGO_PRIVATE_H__
+
+#include <pango/pango.h>
+#include "gtk/gtksnapshot.h"
+
+G_BEGIN_DECLS
+
+#define GSK_TYPE_PANGO_RENDERER            (gsk_pango_renderer_get_type ())
+#define GSK_PANGO_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRenderer))
+#define GSK_IS_PANGO_RENDERER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSK_TYPE_PANGO_RENDERER))
+#define GSK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
+#define GSK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSK_TYPE_PANGO_RENDERER))
+#define GSK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_PANGO_RENDERER, GskPangoRendererClass))
+
+typedef struct _GskPangoRenderer      GskPangoRenderer;
+typedef struct _GskPangoRendererClass GskPangoRendererClass;
+
+typedef enum
+{
+  GSK_PANGO_RENDERER_NORMAL,
+  GSK_PANGO_RENDERER_SELECTED,
+  GSK_PANGO_RENDERER_CURSOR
+} GskPangoRendererState;
+
+typedef gboolean (*GskPangoShapeHandler) (PangoAttrShape         *attr,
+                                          GdkSnapshot            *snapshot,
+                                          double                  width,
+                                          double                  height);
+
+/*
+ * This is a PangoRenderer implementation that translates all the draw calls to
+ * gsk render nodes, using the GtkSnapshot helper class. Glyphs are translated
+ * to text nodes, other draw calls may fall back to cairo nodes.
+ */
+
+struct _GskPangoRenderer
+{
+  PangoRenderer          parent_instance;
+
+  GtkWidget             *widget;
+  GtkSnapshot           *snapshot;
+  const GdkRGBA         *fg_color;
+
+  /* Error underline color for this widget */
+  GdkRGBA               *error_color;
+
+  GskPangoRendererState  state;
+
+  guint                  is_cached_renderer : 1;
+
+  GskPangoShapeHandler   shape_handler;
+};
+
+struct _GskPangoRendererClass
+{
+  PangoRendererClass parent_class;
+};
+
+GType             gsk_pango_renderer_get_type  (void) G_GNUC_CONST;
+void              gsk_pango_renderer_set_state (GskPangoRenderer      *crenderer,
+                                                GskPangoRendererState  state);
+void              gsk_pango_renderer_set_shape_handler (GskPangoRenderer      *crenderer,
+                                                        GskPangoShapeHandler handler);
+GskPangoRenderer *gsk_pango_renderer_acquire   (void);
+void              gsk_pango_renderer_release   (GskPangoRenderer      *crenderer);
+
+G_END_DECLS
+
+#endif /* __GSK_PANGO_PRIVATE_H__ */
index ba74f321adcd4e8d8dee16d7a924e36d1868edb2..66029dbff445b5f2399cc65247bc84fe7bea5d2e 100644 (file)
@@ -25,7 +25,7 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtksnapshotprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 
 #include "gsk/gskcairoblurprivate.h"
 #include "gsk/gskroundedrectprivate.h"
index f82dbb6aeba5e321c66e0c69eff5c60c625107d6..8918caf5ebafdc749a9ea54972d1d530cfd8b2a1 100644 (file)
@@ -34,7 +34,7 @@
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkrendernodepaintableprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 
 
 /**
index 3c2febf3c01927e755d04e2a7b60172572b087b0..e66812ba18766f442898a74361674a1a5842f056 100644 (file)
@@ -48,7 +48,7 @@
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpopover.h"
 #include "gtkprivate.h"
 #include "gtkprogressbar.h"
@@ -56,7 +56,7 @@
 #include "gtksnapshot.h"
 #include "gtktextprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
index e2bf702c04db2da7c184ce035b762f6fd8fd4933..c86a08a4bfa7187626db51f3c8c9899f93975f96 100644 (file)
@@ -45,7 +45,7 @@
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
 #include "gtkpaned.h"
-#include "gtkpathbar.h"
+#include "gtkpathbarprivate.h"
 #include "gtkplacessidebarprivate.h"
 #include "gtkplacesviewprivate.h"
 #include "gtkprivate.h"
index 10fe1ec5e51fa092178e5d7095580a3a1c71706e..46d7f10b9146cb8fc7dfe87b51c109c0538d35f3 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "gtkfilechooserutils.h"
 #include "gtkmarshalers.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtktreemodel.h"
 #include "gtkfilter.h"
index 42dff1eadad0ff71213f289419cbe4b6e3e25b0d..598c6600c0afb559e54106e5a9c48c03809e9226 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "gtkcssnodeprivate.h"
 #include "gtkcssstylechangeprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtksnapshot.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
index 7602401d3c4302d4bef877f6ef827c5af2f0889e..9e2ce06cd6c9c093974906764c814e82a0910e88 100644 (file)
@@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 #include "gtkmarshalers.h"
 #include "gtknotebook.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkprivate.h"
 #include "gtkshortcut.h"
 #include "gtkshortcutcontroller.h"
@@ -43,7 +43,7 @@
 #include "gtkshow.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
index acf7b8942ffa7d000e724ff584b08c2ccd3b5b8c..4e442bed31a7176535c59f20141e5fa3244e73df 100644 (file)
@@ -22,7 +22,7 @@
 #include <gobject/gvaluecollector.h>
 #include "gtktreemodel.h"
 #include "gtkliststore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
index 3ba6c23aba4ec07979bb14e4a347d81cd989ed47..68a80e5c46752c4a498499657d78c4d1ea15152e 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include <pango/pangocairo.h>
 #include "gtkbuilderprivate.h"
 
diff --git a/gtk/gtkpango.h b/gtk/gtkpango.h
deleted file mode 100644 (file)
index 3d673d9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_PANGO_H__
-#define __GTK_PANGO_H__
-
-#include <pango/pangocairo.h>
-#include  "gtkbuildable.h"
-
-G_BEGIN_DECLS
-
-PangoAttrList *_gtk_pango_attr_list_merge (PangoAttrList *into,
-                                           PangoAttrList *from) G_GNUC_WARN_UNUSED_RESULT;
-
-gboolean gtk_buildable_attribute_tag_start (GtkBuildable       *buildable,
-                                            GtkBuilder         *builder,
-                                            GObject            *child,
-                                            const char         *tagname,
-                                            GtkBuildableParser *parser,
-                                            gpointer           *data);
-
-typedef struct {
-  GtkBuilder    *builder;
-  GObject       *object;
-  PangoAttrList *attrs;
-} GtkPangoAttributeParserData;
-
-void
-gtk_pango_attribute_start_element (GtkBuildableParseContext  *context,
-                                   const char                *element_name,
-                                   const char               **names,
-                                   const char               **values,
-                                   gpointer                   user_data,
-                                   GError                   **error);
-
-const char *pango_wrap_mode_to_string (PangoWrapMode mode);
-const char *pango_underline_to_string (PangoUnderline underline);
-const char *pango_stretch_to_string (PangoStretch stretch);
-const char *pango_style_to_string (PangoStyle style);
-const char *pango_variant_to_string (PangoVariant variant);
-const char *pango_align_to_string (PangoAlignment align);
-
-G_END_DECLS
-
-#endif /* __GTK_PANGO_H__ */
diff --git a/gtk/gtkpangoprivate.h b/gtk/gtkpangoprivate.h
new file mode 100644 (file)
index 0000000..cb16bcb
--- /dev/null
@@ -0,0 +1,66 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_PANGO_PRIVATE_H__
+#define __GTK_PANGO_PRIVATE_H__
+
+#include <pango/pangocairo.h>
+#include  "gtkbuildable.h"
+
+G_BEGIN_DECLS
+
+PangoAttrList *_gtk_pango_attr_list_merge (PangoAttrList *into,
+                                           PangoAttrList *from) G_GNUC_WARN_UNUSED_RESULT;
+
+gboolean gtk_buildable_attribute_tag_start (GtkBuildable       *buildable,
+                                            GtkBuilder         *builder,
+                                            GObject            *child,
+                                            const char         *tagname,
+                                            GtkBuildableParser *parser,
+                                            gpointer           *data);
+
+typedef struct {
+  GtkBuilder    *builder;
+  GObject       *object;
+  PangoAttrList *attrs;
+} GtkPangoAttributeParserData;
+
+void
+gtk_pango_attribute_start_element (GtkBuildableParseContext  *context,
+                                   const char                *element_name,
+                                   const char               **names,
+                                   const char               **values,
+                                   gpointer                   user_data,
+                                   GError                   **error);
+
+const char *pango_wrap_mode_to_string (PangoWrapMode mode);
+const char *pango_underline_to_string (PangoUnderline underline);
+const char *pango_stretch_to_string (PangoStretch stretch);
+const char *pango_style_to_string (PangoStyle style);
+const char *pango_variant_to_string (PangoVariant variant);
+const char *pango_align_to_string (PangoAlignment align);
+
+G_END_DECLS
+
+#endif /* __GTK_PANGO_PRIVATE_H__ */
index 9e4916d5625628bc4a3607466a6d415d362213fe..62aa838d2a6ac0c146ce1accc55774e4de9245e9 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "gtkpathbar.h"
+#include "gtkpathbarprivate.h"
 
 #include <string.h>
 
diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
deleted file mode 100644 (file)
index 11ed724..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/* gtkpathbar.h
- * Copyright (C) 2004  Red Hat, Inc.,  Jonathan Blandford <jrb@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_PATH_BAR_H__
-#define __GTK_PATH_BAR_H__
-
-#include "gtkwidget.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_PATH_BAR    (gtk_path_bar_get_type ())
-#define GTK_PATH_BAR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PATH_BAR, GtkPathBar))
-#define GTK_IS_PATH_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PATH_BAR))
-
-typedef struct _GtkPathBar GtkPathBar;
-
-GDK_AVAILABLE_IN_ALL
-GType    gtk_path_bar_get_type (void) G_GNUC_CONST;
-void     _gtk_path_bar_set_file        (GtkPathBar         *path_bar,
-                                        GFile              *file,
-                                        gboolean            keep_trail);
-void     _gtk_path_bar_up              (GtkPathBar *path_bar);
-void     _gtk_path_bar_down            (GtkPathBar *path_bar);
-
-G_END_DECLS
-
-#endif /* __GTK_PATH_BAR_H__ */
diff --git a/gtk/gtkpathbarprivate.h b/gtk/gtkpathbarprivate.h
new file mode 100644 (file)
index 0000000..3b20985
--- /dev/null
@@ -0,0 +1,41 @@
+/* gtkpathbarprivate.h
+ * Copyright (C) 2004  Red Hat, Inc.,  Jonathan Blandford <jrb@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_PATH_BAR_PRIVATE_H__
+#define __GTK_PATH_BAR_PRIVATE_H__
+
+#include "gtkwidget.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_PATH_BAR    (gtk_path_bar_get_type ())
+#define GTK_PATH_BAR(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PATH_BAR, GtkPathBar))
+#define GTK_IS_PATH_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PATH_BAR))
+
+typedef struct _GtkPathBar GtkPathBar;
+
+GDK_AVAILABLE_IN_ALL
+GType    gtk_path_bar_get_type (void) G_GNUC_CONST;
+void     _gtk_path_bar_set_file        (GtkPathBar         *path_bar,
+                                        GFile              *file,
+                                        gboolean            keep_trail);
+void     _gtk_path_bar_up              (GtkPathBar *path_bar);
+void     _gtk_path_bar_down            (GtkPathBar *path_bar);
+
+G_END_DECLS
+
+#endif /* __GTK_PATH_BAR_PRIVATE_H__ */
index 0e6120c7b8b8c76b30bb4dd6e00381a4df944d38..b2fb2aaeb8ee74315c61c4a4c6ff1f8841e34c63 100644 (file)
@@ -41,7 +41,7 @@
 #include "gtkmountoperation.h"
 #include "gtkscrolledwindow.h"
 #include "gtksettings.h"
-#include "gtktrashmonitor.h"
+#include "gtktrashmonitorprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkpopovermenu.h"
index afa27b45f1221c5bdff2aab07c93df31df237ab7..f3902fa376173d4d8d62f4bece8c96d317a40a4e 100644 (file)
@@ -35,7 +35,7 @@
 #include "gsk/gskrendernodeprivate.h"
 #include "gsk/gskroundedrectprivate.h"
 
-#include "gtk/gskpango.h"
+#include "gtk/gskpangoprivate.h"
 
 #define GDK_ARRAY_NAME gtk_snapshot_nodes
 #define GDK_ARRAY_TYPE_NAME GtkSnapshotNodes
index ba3e22387fe98e42a8a864e6015830629699aa0f..b7c40370b052deddb2c1fdb64de599194e2f1b8e 100644 (file)
@@ -49,7 +49,7 @@
 #include "gtkmagnifierprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkpopovermenu.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
@@ -57,7 +57,7 @@
 #include "gtkstylecontextprivate.h"
 #include "gtktexthandleprivate.h"
 #include "gtktexthistoryprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
index 856b4f33106220ea37165d77f04050ae8a4f1bd7..d8cef2518ec4bfb2aaa6aca0835410186b4da07e 100644 (file)
@@ -49,7 +49,7 @@
 
 #include "config.h"
 
-#include "gtktextattributes.h"
+#include "gtktextattributesprivate.h"
 #include "gtktexttagprivate.h"
 
 /**
diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
deleted file mode 100644 (file)
index 3aa01c8..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/* gtktextattributes.h - text attributes
- *
- * Copyright (c) 1992-1994 The Regents of the University of California.
- * Copyright (c) 1994-1997 Sun Microsystems, Inc.
- * Copyright (c) 2000      Red Hat, Inc.
- * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
- *
- * This software is copyrighted by the Regents of the University of
- * 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
- * all copies and that this notice is included verbatim in any
- * distributions. No written agreement, license, or royalty fee is
- * required for any of the authorized uses.  Modifications to this
- * 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
- * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
- * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- * GOVERNMENT USE: If you are acquiring this software on behalf of the
- * U.S. government, the Government shall have only "Restricted Rights"
- * in the software and related documentation as defined in the Federal
- * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
- * are acquiring the software on behalf of the Department of Defense,
- * the software shall be classified as "Commercial Computer Software"
- * and the Government shall have only "Restricted Rights" as defined
- * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
- * 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_ATTRIBUTES_H__
-#define __GTK_TEXT_ATTRIBUTES_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-
-
-G_BEGIN_DECLS
-
-typedef struct _GtkTextAttributes GtkTextAttributes;
-typedef struct _GtkTextAppearance GtkTextAppearance;
-
-struct _GtkTextAppearance
-{
-  GdkRGBA *bg_rgba;
-  GdkRGBA *fg_rgba;
-  GdkRGBA *underline_rgba;
-  GdkRGBA *overline_rgba;
-  GdkRGBA *strikethrough_rgba;
-
-  /* super/subscript rise, can be negative */
-  int rise;
-
-  guint underline : 4;          /* PangoUnderline */
-  guint overline  : 2;          /* PangoOverline */
-  guint strikethrough : 1;
-
-  /* Whether to use background-related values; this is irrelevant for
-   * the values struct when in a tag, but is used for the composite
-   * values struct; it's true if any of the tags being composited
-   * had background stuff set.
-   */
-  guint draw_bg : 1;
-
-  /* These are only used when we are actually laying out and rendering
-   * a paragraph; not when a GtkTextAppearance is part of a
-   * GtkTextAttributes.
-   */
-  guint inside_selection : 1;
-  guint is_text : 1;
-};
-
-/**
- * GtkTextAttributes:
- * @appearance: GtkTextAppearance for text.
- * @justification: GtkJustification for text.
- * @direction: GtkTextDirection for text.
- * @font: `PangoFontDescription` for text.
- * @font_scale: Font scale factor.
- * @left_margin: Width of the left margin in pixels.
- * @right_margin: Width of the right margin in pixels.
- * @indent: Amount to indent the paragraph, in pixels.
- * @pixels_above_lines: Pixels of blank space above paragraphs.
- * @pixels_below_lines: Pixels of blank space below paragraphs.
- * @pixels_inside_wrap: Pixels of blank space between wrapped lines in
- *   a paragraph.
- * @tabs: Custom `PangoTabArray` for this text.
- * @wrap_mode: `GtkWrapMode` for text.
- * @language: `PangoLanguage` for text.
- * @invisible: Hide the text.
- * @bg_full_height: Background is fit to full line height rather than
- *    baseline +/- ascent/descent (font height).
- * @editable: Can edit this text.
- * @no_fallback: Whether to disable font fallback.
- * @letter_spacing: Extra space to insert between graphemes, in Pango units
- *
- * Using GtkTextAttributes directly should rarely be necessary.
- * It’s primarily useful with gtk_text_iter_get_attributes().
- * As with most GTK structs, the fields in this struct should only
- * be read, never modified directly.
- */
-struct _GtkTextAttributes
-{
-  guint refcount;
-
-  GtkJustification justification;
-  GtkTextDirection direction;
-  GtkWrapMode wrap_mode;
-
-  GtkTextAppearance appearance;
-
-  PangoFontDescription *font;
-  char *font_features;
-
-  GdkRGBA *pg_bg_rgba;
-
-  PangoTabArray *tabs;
-  PangoLanguage *language;
-
-  double font_scale;
-
-  int left_margin;
-  int right_margin;
-  int indent;
-
-  int pixels_above_lines;
-  int pixels_below_lines;
-  int pixels_inside_wrap;
-
-  float line_height;
-
-  int letter_spacing;
-
-  guint invisible : 1;
-  guint bg_full_height : 1;
-  guint editable : 1;
-  guint no_fallback: 1;
-  guint no_breaks : 1;
-  guint show_spaces : 3; /* PangoShowFlags */
-  guint no_hyphens : 1;
-  guint line_height_is_absolute : 1;
-  guint text_transform : 3; /* PangoTextTransform */
-  guint word : 1;
-  guint sentence : 1;
-};
-
-GtkTextAttributes* gtk_text_attributes_new         (void);
-GtkTextAttributes* gtk_text_attributes_copy        (GtkTextAttributes *src);
-void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
-                                                    GtkTextAttributes *dest);
-void               gtk_text_attributes_unref       (GtkTextAttributes *values);
-GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
-
-G_END_DECLS
-
-#endif
diff --git a/gtk/gtktextattributesprivate.h b/gtk/gtktextattributesprivate.h
new file mode 100644 (file)
index 0000000..71b4ad6
--- /dev/null
@@ -0,0 +1,176 @@
+/* gtktextattributes.h - text attributes
+ *
+ * Copyright (c) 1992-1994 The Regents of the University of California.
+ * Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright (c) 2000      Red Hat, Inc.
+ * Tk -> Gtk port by Havoc Pennington <hp@redhat.com>
+ *
+ * This software is copyrighted by the Regents of the University of
+ * 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
+ * all copies and that this notice is included verbatim in any
+ * distributions. No written agreement, license, or royalty fee is
+ * required for any of the authorized uses.  Modifications to this
+ * 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
+ * NON-INFRINGEMENT.  THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+ * AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * GOVERNMENT USE: If you are acquiring this software on behalf of the
+ * U.S. government, the Government shall have only "Restricted Rights"
+ * in the software and related documentation as defined in the Federal
+ * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+ * are acquiring the software on behalf of the Department of Defense,
+ * the software shall be classified as "Commercial Computer Software"
+ * and the Government shall have only "Restricted Rights" as defined
+ * in Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
+ * 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_ATTRIBUTES_PRIVATE_H__
+#define __GTK_TEXT_ATTRIBUTES_PRIVATE_H__
+
+
+#include <gdk/gdk.h>
+#include <gtk/gtkenums.h>
+
+
+G_BEGIN_DECLS
+
+typedef struct _GtkTextAttributes GtkTextAttributes;
+typedef struct _GtkTextAppearance GtkTextAppearance;
+
+struct _GtkTextAppearance
+{
+  GdkRGBA *bg_rgba;
+  GdkRGBA *fg_rgba;
+  GdkRGBA *underline_rgba;
+  GdkRGBA *overline_rgba;
+  GdkRGBA *strikethrough_rgba;
+
+  /* super/subscript rise, can be negative */
+  int rise;
+
+  guint underline : 4;          /* PangoUnderline */
+  guint overline  : 2;          /* PangoOverline */
+  guint strikethrough : 1;
+
+  /* Whether to use background-related values; this is irrelevant for
+   * the values struct when in a tag, but is used for the composite
+   * values struct; it's true if any of the tags being composited
+   * had background stuff set.
+   */
+  guint draw_bg : 1;
+
+  /* These are only used when we are actually laying out and rendering
+   * a paragraph; not when a GtkTextAppearance is part of a
+   * GtkTextAttributes.
+   */
+  guint inside_selection : 1;
+  guint is_text : 1;
+};
+
+/**
+ * GtkTextAttributes:
+ * @appearance: GtkTextAppearance for text.
+ * @justification: GtkJustification for text.
+ * @direction: GtkTextDirection for text.
+ * @font: `PangoFontDescription` for text.
+ * @font_scale: Font scale factor.
+ * @left_margin: Width of the left margin in pixels.
+ * @right_margin: Width of the right margin in pixels.
+ * @indent: Amount to indent the paragraph, in pixels.
+ * @pixels_above_lines: Pixels of blank space above paragraphs.
+ * @pixels_below_lines: Pixels of blank space below paragraphs.
+ * @pixels_inside_wrap: Pixels of blank space between wrapped lines in
+ *   a paragraph.
+ * @tabs: Custom `PangoTabArray` for this text.
+ * @wrap_mode: `GtkWrapMode` for text.
+ * @language: `PangoLanguage` for text.
+ * @invisible: Hide the text.
+ * @bg_full_height: Background is fit to full line height rather than
+ *    baseline +/- ascent/descent (font height).
+ * @editable: Can edit this text.
+ * @no_fallback: Whether to disable font fallback.
+ * @letter_spacing: Extra space to insert between graphemes, in Pango units
+ *
+ * Using GtkTextAttributes directly should rarely be necessary.
+ * It’s primarily useful with gtk_text_iter_get_attributes().
+ * As with most GTK structs, the fields in this struct should only
+ * be read, never modified directly.
+ */
+struct _GtkTextAttributes
+{
+  guint refcount;
+
+  GtkJustification justification;
+  GtkTextDirection direction;
+  GtkWrapMode wrap_mode;
+
+  GtkTextAppearance appearance;
+
+  PangoFontDescription *font;
+  char *font_features;
+
+  GdkRGBA *pg_bg_rgba;
+
+  PangoTabArray *tabs;
+  PangoLanguage *language;
+
+  double font_scale;
+
+  int left_margin;
+  int right_margin;
+  int indent;
+
+  int pixels_above_lines;
+  int pixels_below_lines;
+  int pixels_inside_wrap;
+
+  float line_height;
+
+  int letter_spacing;
+
+  guint invisible : 1;
+  guint bg_full_height : 1;
+  guint editable : 1;
+  guint no_fallback: 1;
+  guint no_breaks : 1;
+  guint show_spaces : 3; /* PangoShowFlags */
+  guint no_hyphens : 1;
+  guint line_height_is_absolute : 1;
+  guint text_transform : 3; /* PangoTextTransform */
+  guint word : 1;
+  guint sentence : 1;
+};
+
+GtkTextAttributes* gtk_text_attributes_new         (void);
+GtkTextAttributes* gtk_text_attributes_copy        (GtkTextAttributes *src);
+void               gtk_text_attributes_copy_values (GtkTextAttributes *src,
+                                                    GtkTextAttributes *dest);
+void               gtk_text_attributes_unref       (GtkTextAttributes *values);
+GtkTextAttributes *gtk_text_attributes_ref         (GtkTextAttributes *values);
+
+G_END_DECLS
+
+#endif
index cdf100e4fee1e4e007735c73a77c32a2d94a7722..2a756e49d41cc1c4e3f5a18a2fdc4aa13f1724af 100644 (file)
@@ -53,7 +53,7 @@
  */
 
 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -65,8 +65,8 @@
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
 #include "gtktextmarkprivate.h"
-#include "gtktextsegment.h"
-#include "gtkpango.h"
+#include "gtktextsegmentprivate.h"
+#include "gtkpangoprivate.h"
 #include "gdkprivate.h"
 
 /*
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
deleted file mode 100644 (file)
index 66e61c6..0000000
+++ /dev/null
@@ -1,350 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextbtree.h Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_BTREE_H__
-#define __GTK_TEXT_BTREE_H__
-
-#if 0
-#define DEBUG_VALIDATION_AND_SCROLLING
-#endif
-
-#ifdef DEBUG_VALIDATION_AND_SCROLLING
-#define DV(x) (x)
-#else
-#define DV(x)
-#endif
-
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktextchild.h>
-#include <gtk/gtktextsegment.h>
-#include <gtk/gtktextiter.h>
-
-G_BEGIN_DECLS
-
-GtkTextBTree  *_gtk_text_btree_new        (GtkTextTagTable *table,
-                                           GtkTextBuffer   *buffer);
-void           _gtk_text_btree_ref        (GtkTextBTree    *tree);
-void           _gtk_text_btree_unref      (GtkTextBTree    *tree);
-GtkTextBuffer *_gtk_text_btree_get_buffer (GtkTextBTree    *tree);
-
-
-guint _gtk_text_btree_get_chars_changed_stamp    (GtkTextBTree *tree);
-guint _gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree);
-void  _gtk_text_btree_segments_changed           (GtkTextBTree *tree);
-
-gboolean _gtk_text_btree_is_end (GtkTextBTree       *tree,
-                                 GtkTextLine        *line,
-                                 GtkTextLineSegment *seg,
-                                 int                 byte_index,
-                                 int                 char_offset);
-
-/* Indexable segment mutation */
-
-void _gtk_text_btree_delete           (GtkTextIter  *start,
-                                       GtkTextIter  *end);
-void _gtk_text_btree_insert           (GtkTextIter  *iter,
-                                       const char   *text,
-                                       int           len);
-void _gtk_text_btree_insert_paintable (GtkTextIter  *iter,
-                                       GdkPaintable *texture);
-
-void _gtk_text_btree_insert_child_anchor (GtkTextIter        *iter,
-                                          GtkTextChildAnchor *anchor);
-
-void _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
-
-/* View stuff */
-GtkTextLine *_gtk_text_btree_find_line_by_y    (GtkTextBTree      *tree,
-                                                gpointer           view_id,
-                                                int                ypixel,
-                                                int               *line_top_y);
-int          _gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
-                                                GtkTextLine       *line,
-                                                gpointer           view_id);
-void         _gtk_text_btree_add_view          (GtkTextBTree      *tree,
-                                                GtkTextLayout     *layout);
-void         _gtk_text_btree_remove_view       (GtkTextBTree      *tree,
-                                                gpointer           view_id);
-void         _gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
-                                                const GtkTextIter *start,
-                                                const GtkTextIter *end,
-                                                gboolean           cursors_only);
-void         _gtk_text_btree_get_view_size     (GtkTextBTree      *tree,
-                                                gpointer           view_id,
-                                                int               *width,
-                                                int               *height);
-gboolean     _gtk_text_btree_is_valid          (GtkTextBTree      *tree,
-                                                gpointer           view_id);
-gboolean     _gtk_text_btree_validate          (GtkTextBTree      *tree,
-                                                gpointer           view_id,
-                                                int                max_pixels,
-                                                int               *y,
-                                                int               *old_height,
-                                                int               *new_height);
-void         _gtk_text_btree_validate_line     (GtkTextBTree      *tree,
-                                                GtkTextLine       *line,
-                                                gpointer           view_id);
-
-/* Tag */
-
-void _gtk_text_btree_tag (const GtkTextIter *start,
-                          const GtkTextIter *end,
-                          GtkTextTag        *tag,
-                          gboolean           apply);
-
-/* "Getters" */
-
-GtkTextLine * _gtk_text_btree_get_line          (GtkTextBTree      *tree,
-                                                 int                line_number,
-                                                 int               *real_line_number);
-GtkTextLine * _gtk_text_btree_get_line_no_last  (GtkTextBTree      *tree,
-                                                 int                line_number,
-                                                 int               *real_line_number);
-GtkTextLine * _gtk_text_btree_get_end_iter_line (GtkTextBTree      *tree);
-GtkTextLine * _gtk_text_btree_get_line_at_char  (GtkTextBTree      *tree,
-                                                 int                char_index,
-                                                 int               *line_start_index,
-                                                 int               *real_char_index);
-GPtrArray    * _gtk_text_btree_get_tags          (const GtkTextIter *iter);
-char         *_gtk_text_btree_get_text          (const GtkTextIter *start,
-                                                 const GtkTextIter *end,
-                                                 gboolean           include_hidden,
-                                                 gboolean           include_nonchars);
-int           _gtk_text_btree_line_count        (GtkTextBTree      *tree);
-int           _gtk_text_btree_char_count        (GtkTextBTree      *tree);
-gboolean      _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
-
-
-
-/* Get iterators (these are implemented in gtktextiter.c) */
-void     _gtk_text_btree_get_iter_at_char         (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   int                 char_index);
-void     _gtk_text_btree_get_iter_at_line_char    (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   int                 line_number,
-                                                   int                 char_index);
-void     _gtk_text_btree_get_iter_at_line_byte    (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   int                 line_number,
-                                                   int                 byte_index);
-gboolean _gtk_text_btree_get_iter_from_string     (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   const char         *string);
-gboolean _gtk_text_btree_get_iter_at_mark_name    (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   const char         *mark_name);
-void     _gtk_text_btree_get_iter_at_mark         (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   GtkTextMark        *mark);
-void     _gtk_text_btree_get_iter_at_paintable    (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   GtkTextLineSegment *seg);
-void     _gtk_text_btree_get_end_iter             (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter);
-void     _gtk_text_btree_get_iter_at_line         (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   GtkTextLine        *line,
-                                                   int                 byte_offset);
-gboolean _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   GtkTextTag         *tag);
-gboolean _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree       *tree,
-                                                   GtkTextIter        *iter,
-                                                   GtkTextTag         *tag);
-
-void     _gtk_text_btree_get_iter_at_child_anchor  (GtkTextBTree       *tree,
-                                                    GtkTextIter        *iter,
-                                                    GtkTextChildAnchor *anchor);
-
-
-
-/* Manipulate marks */
-GtkTextMark        *_gtk_text_btree_set_mark                (GtkTextBTree       *tree,
-                                                             GtkTextMark         *existing_mark,
-                                                             const char         *name,
-                                                             gboolean            left_gravity,
-                                                             const GtkTextIter  *index,
-                                                             gboolean           should_exist);
-void                _gtk_text_btree_remove_mark_by_name     (GtkTextBTree       *tree,
-                                                             const char         *name);
-void                _gtk_text_btree_remove_mark             (GtkTextBTree       *tree,
-                                                             GtkTextMark        *segment);
-gboolean            _gtk_text_btree_get_selection_bounds    (GtkTextBTree       *tree,
-                                                             GtkTextIter        *start,
-                                                             GtkTextIter        *end);
-void                _gtk_text_btree_place_cursor            (GtkTextBTree       *tree,
-                                                             const GtkTextIter  *where);
-void                _gtk_text_btree_select_range            (GtkTextBTree       *tree,
-                                                             const GtkTextIter  *ins,
-                                                            const GtkTextIter  *bound);
-gboolean            _gtk_text_btree_mark_is_insert          (GtkTextBTree       *tree,
-                                                             GtkTextMark        *segment);
-gboolean            _gtk_text_btree_mark_is_selection_bound (GtkTextBTree       *tree,
-                                                             GtkTextMark        *segment);
-GtkTextMark        *_gtk_text_btree_get_insert             (GtkTextBTree       *tree);
-GtkTextMark        *_gtk_text_btree_get_selection_bound            (GtkTextBTree       *tree);
-GtkTextMark        *_gtk_text_btree_get_mark_by_name        (GtkTextBTree       *tree,
-                                                             const char         *name);
-GtkTextLine *       _gtk_text_btree_first_could_contain_tag (GtkTextBTree       *tree,
-                                                             GtkTextTag         *tag);
-GtkTextLine *       _gtk_text_btree_last_could_contain_tag  (GtkTextBTree       *tree,
-                                                             GtkTextTag         *tag);
-
-/* Lines */
-
-/* Chunk of data associated with a line; views can use this to store
-   info at the line. They should "subclass" the header struct here. */
-struct _GtkTextLineData {
-  gpointer view_id;
-  GtkTextLineData *next;
-  int height;
-  int top_ink : 16;
-  int bottom_ink : 16;
-  signed int width : 24;
-  guint valid : 8;             /* Actually a boolean */
-};
-
-/*
- * The data structure below defines a single line of text (from newline
- * to newline, not necessarily what appears on one line of the screen).
- *
- * You can consider this line a "paragraph" also
- */
-
-struct _GtkTextLine {
-  GtkTextBTreeNode *parent;             /* Pointer to parent node containing
-                                         * line. */
-  GtkTextLine *next;            /* Next in linked list of lines with
-                                 * same parent node in B-tree.  NULL
-                                 * means end of list. */
-  GtkTextLineSegment *segments; /* First in ordered list of segments
-                                 * that make up the line. */
-  GtkTextLineData *views;      /* data stored here by views */
-  guchar dir_strong;                /* BiDi algo dir of line */
-  guchar dir_propagated_back;       /* BiDi algo dir of next line */
-  guchar dir_propagated_forward;    /* BiDi algo dir of prev line */
-};
-
-
-int                 _gtk_text_line_get_number                 (GtkTextLine         *line);
-gboolean            _gtk_text_line_char_has_tag               (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree,
-                                                               int                  char_in_line,
-                                                               GtkTextTag          *tag);
-gboolean            _gtk_text_line_byte_has_tag               (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree,
-                                                               int                  byte_in_line,
-                                                               GtkTextTag          *tag);
-gboolean            _gtk_text_line_is_last                    (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree);
-gboolean            _gtk_text_line_contains_end_iter          (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree);
-GtkTextLine *       _gtk_text_line_next                       (GtkTextLine         *line);
-GtkTextLine *       _gtk_text_line_next_excluding_last        (GtkTextLine         *line);
-GtkTextLine *       _gtk_text_line_previous                   (GtkTextLine         *line);
-void                _gtk_text_line_add_data                   (GtkTextLine         *line,
-                                                               GtkTextLineData     *data);
-gpointer            _gtk_text_line_remove_data                (GtkTextLine         *line,
-                                                               gpointer             view_id);
-gpointer            _gtk_text_line_get_data                   (GtkTextLine         *line,
-                                                               gpointer             view_id);
-void                _gtk_text_line_invalidate_wrap            (GtkTextLine         *line,
-                                                               GtkTextLineData     *ld);
-int                 _gtk_text_line_char_count                 (GtkTextLine         *line);
-int                 _gtk_text_line_byte_count                 (GtkTextLine         *line);
-int                 _gtk_text_line_char_index                 (GtkTextLine         *line);
-GtkTextLineSegment *_gtk_text_line_byte_to_segment            (GtkTextLine         *line,
-                                                               int                  byte_offset,
-                                                               int                 *seg_offset);
-GtkTextLineSegment *_gtk_text_line_char_to_segment            (GtkTextLine         *line,
-                                                               int                  char_offset,
-                                                               int                 *seg_offset);
-gboolean            _gtk_text_line_byte_locate                (GtkTextLine         *line,
-                                                               int                  byte_offset,
-                                                               GtkTextLineSegment **segment,
-                                                               GtkTextLineSegment **any_segment,
-                                                               int                 *seg_byte_offset,
-                                                               int                 *line_byte_offset);
-gboolean            _gtk_text_line_char_locate                (GtkTextLine         *line,
-                                                               int                  char_offset,
-                                                               GtkTextLineSegment **segment,
-                                                               GtkTextLineSegment **any_segment,
-                                                               int                 *seg_char_offset,
-                                                               int                 *line_char_offset);
-void                _gtk_text_line_byte_to_char_offsets       (GtkTextLine         *line,
-                                                               int                  byte_offset,
-                                                               int                 *line_char_offset,
-                                                               int                 *seg_char_offset);
-void                _gtk_text_line_char_to_byte_offsets       (GtkTextLine         *line,
-                                                               int                  char_offset,
-                                                               int                 *line_byte_offset,
-                                                               int                 *seg_byte_offset);
-GtkTextLineSegment *_gtk_text_line_byte_to_any_segment        (GtkTextLine         *line,
-                                                               int                  byte_offset,
-                                                               int                 *seg_offset);
-GtkTextLineSegment *_gtk_text_line_char_to_any_segment        (GtkTextLine         *line,
-                                                               int                  char_offset,
-                                                               int                 *seg_offset);
-int                 _gtk_text_line_byte_to_char               (GtkTextLine         *line,
-                                                               int                  byte_offset);
-int                 _gtk_text_line_char_to_byte               (GtkTextLine         *line,
-                                                               int                  char_offset);
-GtkTextLine    *    _gtk_text_line_next_could_contain_tag     (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree,
-                                                               GtkTextTag          *tag);
-GtkTextLine    *    _gtk_text_line_previous_could_contain_tag (GtkTextLine         *line,
-                                                               GtkTextBTree        *tree,
-                                                               GtkTextTag          *tag);
-
-GtkTextLineData    *_gtk_text_line_data_new                   (GtkTextLayout     *layout,
-                                                               GtkTextLine       *line);
-
-/* Debug */
-void _gtk_text_btree_check (GtkTextBTree *tree);
-void _gtk_text_btree_spew (GtkTextBTree *tree);
-extern gboolean _gtk_text_view_debug_btree;
-
-/* ignore, exported only for gtktextsegment.c */
-void _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
-                                     GtkTextLine        *line);
-void _gtk_change_node_toggle_count  (GtkTextBTreeNode   *node,
-                                     GtkTextTagInfo     *info,
-                                     int                 delta);
-
-/* for gtktextmark.c */
-void _gtk_text_btree_release_mark_segment (GtkTextBTree       *tree,
-                                           GtkTextLineSegment *segment);
-
-/* for coordination with the tag table */
-void _gtk_text_btree_notify_will_remove_tag (GtkTextBTree *tree,
-                                             GtkTextTag   *tag);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/gtk/gtktextbtreeprivate.h b/gtk/gtktextbtreeprivate.h
new file mode 100644 (file)
index 0000000..86e79a4
--- /dev/null
@@ -0,0 +1,350 @@
+/* GTK - The GIMP Toolkit
+ * gtktextbtree.h Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_TEXT_BTREE_PRIVATE_H__
+#define __GTK_TEXT_BTREE_PRIVATE_H__
+
+#if 0
+#define DEBUG_VALIDATION_AND_SCROLLING
+#endif
+
+#ifdef DEBUG_VALIDATION_AND_SCROLLING
+#define DV(x) (x)
+#else
+#define DV(x)
+#endif
+
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktexttag.h>
+#include <gtk/gtktextmark.h>
+#include <gtk/gtktextchild.h>
+#include <gtk/gtktextsegmentprivate.h>
+#include <gtk/gtktextiter.h>
+
+G_BEGIN_DECLS
+
+GtkTextBTree  *_gtk_text_btree_new        (GtkTextTagTable *table,
+                                           GtkTextBuffer   *buffer);
+void           _gtk_text_btree_ref        (GtkTextBTree    *tree);
+void           _gtk_text_btree_unref      (GtkTextBTree    *tree);
+GtkTextBuffer *_gtk_text_btree_get_buffer (GtkTextBTree    *tree);
+
+
+guint _gtk_text_btree_get_chars_changed_stamp    (GtkTextBTree *tree);
+guint _gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree);
+void  _gtk_text_btree_segments_changed           (GtkTextBTree *tree);
+
+gboolean _gtk_text_btree_is_end (GtkTextBTree       *tree,
+                                 GtkTextLine        *line,
+                                 GtkTextLineSegment *seg,
+                                 int                 byte_index,
+                                 int                 char_offset);
+
+/* Indexable segment mutation */
+
+void _gtk_text_btree_delete           (GtkTextIter  *start,
+                                       GtkTextIter  *end);
+void _gtk_text_btree_insert           (GtkTextIter  *iter,
+                                       const char   *text,
+                                       int           len);
+void _gtk_text_btree_insert_paintable (GtkTextIter  *iter,
+                                       GdkPaintable *texture);
+
+void _gtk_text_btree_insert_child_anchor (GtkTextIter        *iter,
+                                          GtkTextChildAnchor *anchor);
+
+void _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
+
+/* View stuff */
+GtkTextLine *_gtk_text_btree_find_line_by_y    (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                int                ypixel,
+                                                int               *line_top_y);
+int          _gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
+                                                GtkTextLine       *line,
+                                                gpointer           view_id);
+void         _gtk_text_btree_add_view          (GtkTextBTree      *tree,
+                                                GtkTextLayout     *layout);
+void         _gtk_text_btree_remove_view       (GtkTextBTree      *tree,
+                                                gpointer           view_id);
+void         _gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
+                                                const GtkTextIter *start,
+                                                const GtkTextIter *end,
+                                                gboolean           cursors_only);
+void         _gtk_text_btree_get_view_size     (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                int               *width,
+                                                int               *height);
+gboolean     _gtk_text_btree_is_valid          (GtkTextBTree      *tree,
+                                                gpointer           view_id);
+gboolean     _gtk_text_btree_validate          (GtkTextBTree      *tree,
+                                                gpointer           view_id,
+                                                int                max_pixels,
+                                                int               *y,
+                                                int               *old_height,
+                                                int               *new_height);
+void         _gtk_text_btree_validate_line     (GtkTextBTree      *tree,
+                                                GtkTextLine       *line,
+                                                gpointer           view_id);
+
+/* Tag */
+
+void _gtk_text_btree_tag (const GtkTextIter *start,
+                          const GtkTextIter *end,
+                          GtkTextTag        *tag,
+                          gboolean           apply);
+
+/* "Getters" */
+
+GtkTextLine * _gtk_text_btree_get_line          (GtkTextBTree      *tree,
+                                                 int                line_number,
+                                                 int               *real_line_number);
+GtkTextLine * _gtk_text_btree_get_line_no_last  (GtkTextBTree      *tree,
+                                                 int                line_number,
+                                                 int               *real_line_number);
+GtkTextLine * _gtk_text_btree_get_end_iter_line (GtkTextBTree      *tree);
+GtkTextLine * _gtk_text_btree_get_line_at_char  (GtkTextBTree      *tree,
+                                                 int                char_index,
+                                                 int               *line_start_index,
+                                                 int               *real_char_index);
+GPtrArray    * _gtk_text_btree_get_tags          (const GtkTextIter *iter);
+char         *_gtk_text_btree_get_text          (const GtkTextIter *start,
+                                                 const GtkTextIter *end,
+                                                 gboolean           include_hidden,
+                                                 gboolean           include_nonchars);
+int           _gtk_text_btree_line_count        (GtkTextBTree      *tree);
+int           _gtk_text_btree_char_count        (GtkTextBTree      *tree);
+gboolean      _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
+
+
+
+/* Get iterators (these are implemented in gtktextiter.c) */
+void     _gtk_text_btree_get_iter_at_char         (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   int                 char_index);
+void     _gtk_text_btree_get_iter_at_line_char    (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   int                 line_number,
+                                                   int                 char_index);
+void     _gtk_text_btree_get_iter_at_line_byte    (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   int                 line_number,
+                                                   int                 byte_index);
+gboolean _gtk_text_btree_get_iter_from_string     (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   const char         *string);
+gboolean _gtk_text_btree_get_iter_at_mark_name    (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   const char         *mark_name);
+void     _gtk_text_btree_get_iter_at_mark         (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextMark        *mark);
+void     _gtk_text_btree_get_iter_at_paintable    (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextLineSegment *seg);
+void     _gtk_text_btree_get_end_iter             (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter);
+void     _gtk_text_btree_get_iter_at_line         (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextLine        *line,
+                                                   int                 byte_offset);
+gboolean _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextTag         *tag);
+gboolean _gtk_text_btree_get_iter_at_last_toggle  (GtkTextBTree       *tree,
+                                                   GtkTextIter        *iter,
+                                                   GtkTextTag         *tag);
+
+void     _gtk_text_btree_get_iter_at_child_anchor  (GtkTextBTree       *tree,
+                                                    GtkTextIter        *iter,
+                                                    GtkTextChildAnchor *anchor);
+
+
+
+/* Manipulate marks */
+GtkTextMark        *_gtk_text_btree_set_mark                (GtkTextBTree       *tree,
+                                                             GtkTextMark         *existing_mark,
+                                                             const char         *name,
+                                                             gboolean            left_gravity,
+                                                             const GtkTextIter  *index,
+                                                             gboolean           should_exist);
+void                _gtk_text_btree_remove_mark_by_name     (GtkTextBTree       *tree,
+                                                             const char         *name);
+void                _gtk_text_btree_remove_mark             (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+gboolean            _gtk_text_btree_get_selection_bounds    (GtkTextBTree       *tree,
+                                                             GtkTextIter        *start,
+                                                             GtkTextIter        *end);
+void                _gtk_text_btree_place_cursor            (GtkTextBTree       *tree,
+                                                             const GtkTextIter  *where);
+void                _gtk_text_btree_select_range            (GtkTextBTree       *tree,
+                                                             const GtkTextIter  *ins,
+                                                            const GtkTextIter  *bound);
+gboolean            _gtk_text_btree_mark_is_insert          (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+gboolean            _gtk_text_btree_mark_is_selection_bound (GtkTextBTree       *tree,
+                                                             GtkTextMark        *segment);
+GtkTextMark        *_gtk_text_btree_get_insert             (GtkTextBTree       *tree);
+GtkTextMark        *_gtk_text_btree_get_selection_bound            (GtkTextBTree       *tree);
+GtkTextMark        *_gtk_text_btree_get_mark_by_name        (GtkTextBTree       *tree,
+                                                             const char         *name);
+GtkTextLine *       _gtk_text_btree_first_could_contain_tag (GtkTextBTree       *tree,
+                                                             GtkTextTag         *tag);
+GtkTextLine *       _gtk_text_btree_last_could_contain_tag  (GtkTextBTree       *tree,
+                                                             GtkTextTag         *tag);
+
+/* Lines */
+
+/* Chunk of data associated with a line; views can use this to store
+   info at the line. They should "subclass" the header struct here. */
+struct _GtkTextLineData {
+  gpointer view_id;
+  GtkTextLineData *next;
+  int height;
+  int top_ink : 16;
+  int bottom_ink : 16;
+  signed int width : 24;
+  guint valid : 8;             /* Actually a boolean */
+};
+
+/*
+ * The data structure below defines a single line of text (from newline
+ * to newline, not necessarily what appears on one line of the screen).
+ *
+ * You can consider this line a "paragraph" also
+ */
+
+struct _GtkTextLine {
+  GtkTextBTreeNode *parent;             /* Pointer to parent node containing
+                                         * line. */
+  GtkTextLine *next;            /* Next in linked list of lines with
+                                 * same parent node in B-tree.  NULL
+                                 * means end of list. */
+  GtkTextLineSegment *segments; /* First in ordered list of segments
+                                 * that make up the line. */
+  GtkTextLineData *views;      /* data stored here by views */
+  guchar dir_strong;                /* BiDi algo dir of line */
+  guchar dir_propagated_back;       /* BiDi algo dir of next line */
+  guchar dir_propagated_forward;    /* BiDi algo dir of prev line */
+};
+
+
+int                 _gtk_text_line_get_number                 (GtkTextLine         *line);
+gboolean            _gtk_text_line_char_has_tag               (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               int                  char_in_line,
+                                                               GtkTextTag          *tag);
+gboolean            _gtk_text_line_byte_has_tag               (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               int                  byte_in_line,
+                                                               GtkTextTag          *tag);
+gboolean            _gtk_text_line_is_last                    (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree);
+gboolean            _gtk_text_line_contains_end_iter          (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree);
+GtkTextLine *       _gtk_text_line_next                       (GtkTextLine         *line);
+GtkTextLine *       _gtk_text_line_next_excluding_last        (GtkTextLine         *line);
+GtkTextLine *       _gtk_text_line_previous                   (GtkTextLine         *line);
+void                _gtk_text_line_add_data                   (GtkTextLine         *line,
+                                                               GtkTextLineData     *data);
+gpointer            _gtk_text_line_remove_data                (GtkTextLine         *line,
+                                                               gpointer             view_id);
+gpointer            _gtk_text_line_get_data                   (GtkTextLine         *line,
+                                                               gpointer             view_id);
+void                _gtk_text_line_invalidate_wrap            (GtkTextLine         *line,
+                                                               GtkTextLineData     *ld);
+int                 _gtk_text_line_char_count                 (GtkTextLine         *line);
+int                 _gtk_text_line_byte_count                 (GtkTextLine         *line);
+int                 _gtk_text_line_char_index                 (GtkTextLine         *line);
+GtkTextLineSegment *_gtk_text_line_byte_to_segment            (GtkTextLine         *line,
+                                                               int                  byte_offset,
+                                                               int                 *seg_offset);
+GtkTextLineSegment *_gtk_text_line_char_to_segment            (GtkTextLine         *line,
+                                                               int                  char_offset,
+                                                               int                 *seg_offset);
+gboolean            _gtk_text_line_byte_locate                (GtkTextLine         *line,
+                                                               int                  byte_offset,
+                                                               GtkTextLineSegment **segment,
+                                                               GtkTextLineSegment **any_segment,
+                                                               int                 *seg_byte_offset,
+                                                               int                 *line_byte_offset);
+gboolean            _gtk_text_line_char_locate                (GtkTextLine         *line,
+                                                               int                  char_offset,
+                                                               GtkTextLineSegment **segment,
+                                                               GtkTextLineSegment **any_segment,
+                                                               int                 *seg_char_offset,
+                                                               int                 *line_char_offset);
+void                _gtk_text_line_byte_to_char_offsets       (GtkTextLine         *line,
+                                                               int                  byte_offset,
+                                                               int                 *line_char_offset,
+                                                               int                 *seg_char_offset);
+void                _gtk_text_line_char_to_byte_offsets       (GtkTextLine         *line,
+                                                               int                  char_offset,
+                                                               int                 *line_byte_offset,
+                                                               int                 *seg_byte_offset);
+GtkTextLineSegment *_gtk_text_line_byte_to_any_segment        (GtkTextLine         *line,
+                                                               int                  byte_offset,
+                                                               int                 *seg_offset);
+GtkTextLineSegment *_gtk_text_line_char_to_any_segment        (GtkTextLine         *line,
+                                                               int                  char_offset,
+                                                               int                 *seg_offset);
+int                 _gtk_text_line_byte_to_char               (GtkTextLine         *line,
+                                                               int                  byte_offset);
+int                 _gtk_text_line_char_to_byte               (GtkTextLine         *line,
+                                                               int                  char_offset);
+GtkTextLine    *    _gtk_text_line_next_could_contain_tag     (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               GtkTextTag          *tag);
+GtkTextLine    *    _gtk_text_line_previous_could_contain_tag (GtkTextLine         *line,
+                                                               GtkTextBTree        *tree,
+                                                               GtkTextTag          *tag);
+
+GtkTextLineData    *_gtk_text_line_data_new                   (GtkTextLayout     *layout,
+                                                               GtkTextLine       *line);
+
+/* Debug */
+void _gtk_text_btree_check (GtkTextBTree *tree);
+void _gtk_text_btree_spew (GtkTextBTree *tree);
+extern gboolean _gtk_text_view_debug_btree;
+
+/* ignore, exported only for gtktextsegment.c */
+void _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
+                                     GtkTextLine        *line);
+void _gtk_change_node_toggle_count  (GtkTextBTreeNode   *node,
+                                     GtkTextTagInfo     *info,
+                                     int                 delta);
+
+/* for gtktextmark.c */
+void _gtk_text_btree_release_mark_segment (GtkTextBTree       *tree,
+                                           GtkTextLineSegment *segment);
+
+/* for coordination with the tag table */
+void _gtk_text_btree_notify_will_remove_tag (GtkTextBTree *tree,
+                                             GtkTextTag   *tag);
+
+G_END_DECLS
+
+#endif
+
+
index 0d59288d93ea58986b73eae17373bc3559717c7f..c396a5e01578e5344ab02efbce421e8dda61ffca 100644 (file)
 #include "gtktextbuffer.h"
 #include "gtktexthistoryprivate.h"
 #include "gtktextbufferprivate.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktexttagprivate.h"
 #include "gtktexttagtableprivate.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtkprivate.h"
 
 #define DEFAULT_MAX_UNDO 200
index ef22648ac5e7ed99b16062f592554f6d6a1b057e..941bc6f05dc9e392504a51b5b51768e17f99e804 100644 (file)
@@ -19,7 +19,7 @@
 #define __GTK_TEXT_BUFFER_PRIVATE_H__
 
 #include <gtk/gtktextbuffer.h>
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"
 
 G_BEGIN_DECLS
 
index c64654835c1689a65e93c7695895a583e91fc555..b3ca5908f6b4c7ac9eede14c95a4f02544335d04 100644 (file)
@@ -49,7 +49,7 @@
 
 #include "config.h"
 #include "gtktextchild.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextlayoutprivate.h"
 #include "gtkprivate.h"
 
index b3d1127f7a900ddb214919dafdabe80059de96e8..e8e94b51d7925537737ad51f0b579c2d072407d7 100644 (file)
@@ -50,7 +50,7 @@
 #ifndef __GTK_TEXT_CHILD_PRIVATE_H__
 #define __GTK_TEXT_CHILD_PRIVATE_H__
 
-#include <gtk/gtktexttypes.h>
+#include <gtk/gtktexttypesprivate.h>
 
 G_BEGIN_DECLS
 
index fcc45976567918d445c080a096c2ea1e3e22cfad..9ffbf581a3ec4610b0fe3298d8f3c828bec97b2c 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include "gtktextiter.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtkdebug.h"
index e9503995f7e9c12610e25dee5522943763b74aa9..d044cdc8cc5b5ed561a52dcf6cbf01c5c9ebba1b 100644 (file)
@@ -30,8 +30,8 @@
 G_BEGIN_DECLS
 
 #include <gtk/gtktextiter.h>
-#include <gtk/gtktextbtree.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextbtreeprivate.h>
+#include <gtk/gtktextattributesprivate.h>
 
 GtkTextLineSegment *_gtk_text_iter_get_indexable_segment      (const GtkTextIter *iter);
 GtkTextLineSegment *_gtk_text_iter_get_any_segment            (const GtkTextIter *iter);
index f394984977d1d49092f2218ec60f89d64c9b1a24..ce97ff62523d0379aa8680bf67a43395ad032110 100644 (file)
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkstylecontextprivate.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextlinedisplaycacheprivate.h"
-#include "gtktextutil.h"
-#include "gskpango.h"
+#include "gtktextutilprivate.h"
+#include "gskpangoprivate.h"
 #include "gtksnapshotprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtktextviewprivate.h"
index 480d1ada6283f0a0634c3526ebf6cb7846ed3b10..1aff8acf7253a232f073265efedbafafd901f5e6 100644 (file)
@@ -79,7 +79,7 @@
 #define __GTK_TEXT_LAYOUT_PRIVATE_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextattributesprivate.h>
 
 G_BEGIN_DECLS
 
index 414d533cc216380e12584374820b78685009b382..1269f5654d5e3a32fe6131d30a890e76cf205eae 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextlinedisplaycacheprivate.h"
index ac4a2f1f228cd593190764cd6cdfaf3249baa79f..f1c5edb4be7c8e0580f66c1840183eef460b40e2 100644 (file)
@@ -48,7 +48,7 @@
  */
 
 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include "gtkprivate.h"
 
 
index ca09d4614973f026ffc704466728e7550f6eaa0e..7e584ad0f2d9ee8d8ff26e6665fce91e8737c141 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef __GTK_TEXT_MARK_PRIVATE_H__
 #define __GTK_TEXT_MARK_PRIVATE_H__
 
-#include <gtk/gtktexttypes.h>
+#include <gtk/gtktexttypesprivate.h>
 #include "gtktextlayoutprivate.h"
 
 G_BEGIN_DECLS
index 0680b73cfa16a7836d940b8890206c652a892ff0..e243b5a2673e67c3cb7abb313419ae0944ff0c7a 100644 (file)
@@ -51,7 +51,7 @@
  */
 
 #include "config.h"
-#include "gtktextbtree.h"
+#include "gtktextbtreeprivate.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
deleted file mode 100644 (file)
index ce093d4..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktextsegment.h Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_SEGMENT_H__
-#define __GTK_TEXT_SEGMENT_H__
-
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmarkprivate.h>
-#include <gtk/gtktextchild.h>
-#include <gtk/gtktextchildprivate.h>
-
-G_BEGIN_DECLS
-
-/*
- * Segments: each line is divided into one or more segments, where each
- * segment is one of several things, such as a group of characters, a
- * tag toggle, a mark, or an embedded widget.  Each segment starts with
- * a standard header followed by a body that varies from type to type.
- */
-
-/* This header has the segment type, and two specific segments
-   (character and toggle segments) */
-
-/* Information a BTree stores about a tag. */
-typedef struct _GtkTextTagInfo GtkTextTagInfo;
-struct _GtkTextTagInfo {
-  GtkTextTag *tag;
-  GtkTextBTreeNode *tag_root; /* highest-level node containing the tag */
-  int toggle_count;      /* total toggles of this tag below tag_root */
-};
-
-/* Body of a segment that toggles a tag on or off */
-struct _GtkTextToggleBody {
-  GtkTextTagInfo *info;             /* Tag that starts or ends here. */
-  gboolean inNodeCounts;             /* TRUE means this toggle has been
-                                      * accounted for in node toggle
-                                      * counts; FALSE means it hasn't, yet. */
-};
-
-
-/* Class struct for segments */
-
-/* Split seg at index, returning list of two new segments, and freeing seg */
-typedef GtkTextLineSegment* (*GtkTextSegSplitFunc)      (GtkTextLineSegment *seg,
-                                                         int                 index);
-
-/* Delete seg which is contained in line; if tree_gone, the tree is being
- * freed in its entirety, which may matter for some reason (?)
- * Return TRUE if the segment is not deleteable, e.g. a mark.
- */
-typedef gboolean            (*GtkTextSegDeleteFunc)     (GtkTextLineSegment *seg,
-                                                         GtkTextLine        *line,
-                                                         gboolean            tree_gone);
-
-/* Called after segment structure of line changes, so segments can
- * cleanup (e.g. merge with adjacent segments). Returns a segment list
- * to replace the original segment list with. The line argument is
- * the current line.
- */
-typedef GtkTextLineSegment* (*GtkTextSegCleanupFunc)    (GtkTextLineSegment *seg,
-                                                         GtkTextLine        *line);
-
-/* Called when a segment moves from one line to another. CleanupFunc is also
- * called in that case, so many segments just use CleanupFunc, I'm not sure
- * what’s up with that (this function may not be needed...)
- */
-typedef void                (*GtkTextSegLineChangeFunc) (GtkTextLineSegment *seg,
-                                                         GtkTextLine        *line);
-
-/* Called to do debug checks on the segment. */
-typedef void                (*GtkTextSegCheckFunc)      (GtkTextLineSegment *seg,
-                                                         GtkTextLine        *line);
-
-struct _GtkTextLineSegmentClass {
-  const char *name;                     /* Name of this kind of segment. */
-  gboolean leftGravity;                 /* If a segment has zero size (e.g. a
-                                         * mark or tag toggle), does it
-                                         * attach to character to its left
-                                         * or right?  1 means left, 0 means
-                                         * right. */
-  GtkTextSegSplitFunc splitFunc;        /* Procedure to split large segment
-                                         * into two smaller ones. */
-  GtkTextSegDeleteFunc deleteFunc;      /* Procedure to call to delete
-                                         * segment. */
-  GtkTextSegCleanupFunc cleanupFunc;   /* After any change to a line, this
-                                        * procedure is invoked for all
-                                        * segments left in the line to
-                                        * perform any cleanup they wish
-                                        * (e.g. joining neighboring
-                                        * segments). */
-  GtkTextSegLineChangeFunc lineChangeFunc;
-  /* Invoked when a segment is about
-   * to be moved from its current line
-   * to an earlier line because of
-   * a deletion.  The line is that
-   * for the segment's old line.
-   * CleanupFunc will be invoked after
-   * the deletion is finished. */
-
-  GtkTextSegCheckFunc checkFunc;       /* Called during consistency checks
-                                        * to check internal consistency of
-                                        * segment. */
-};
-
-/*
- * The data structure below defines line segments.
- */
-
-struct _GtkTextLineSegment {
-  const GtkTextLineSegmentClass *type;  /* Pointer to record describing
-                                         * segment's type. */
-  GtkTextLineSegment *next;             /* Next in list of segments for this
-                                         * line, or NULL for end of list. */
-
-  int char_count;                       /* # of chars of index space occupied */
-
-  int byte_count;                       /* Size of this segment (# of bytes
-                                         * of index space it occupies). */
-  union {
-    char chars[4];                      /* Characters that make up character
-                                         * info.  Actual length varies to
-                                         * hold as many characters as needed.*/
-    GtkTextToggleBody toggle;           /* Information about tag toggle. */
-    GtkTextMarkBody mark;               /* Information about mark. */
-    GtkTextPaintable paintable;         /* Child texture */
-    GtkTextChildBody child;             /* Child widget */
-  } body;
-};
-
-
-GtkTextLineSegment  *gtk_text_line_segment_split (const GtkTextIter *iter);
-
-GtkTextLineSegment *_gtk_char_segment_new                  (const char     *text,
-                                                            guint           len);
-GtkTextLineSegment *_gtk_char_segment_new_from_two_strings (const char     *text1,
-                                                            guint           len1,
-                                                           guint           chars1,
-                                                            const char     *text2,
-                                                            guint           len2,
-                                                           guint           chars2);
-GtkTextLineSegment *_gtk_toggle_segment_new                (GtkTextTagInfo *info,
-                                                            gboolean        on);
-
-void                _gtk_toggle_segment_free               (GtkTextLineSegment *seg);
-
-G_END_DECLS
-
-#endif
-
-
diff --git a/gtk/gtktextsegmentprivate.h b/gtk/gtktextsegmentprivate.h
new file mode 100644 (file)
index 0000000..7f59f28
--- /dev/null
@@ -0,0 +1,172 @@
+/* GTK - The GIMP Toolkit
+ * gtktextsegment.h Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_TEXT_SEGMENT_PRIVATE_H__
+#define __GTK_TEXT_SEGMENT_PRIVATE_H__
+
+#include <gtk/gtktexttag.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextmarkprivate.h>
+#include <gtk/gtktextchild.h>
+#include <gtk/gtktextchildprivate.h>
+
+G_BEGIN_DECLS
+
+/*
+ * Segments: each line is divided into one or more segments, where each
+ * segment is one of several things, such as a group of characters, a
+ * tag toggle, a mark, or an embedded widget.  Each segment starts with
+ * a standard header followed by a body that varies from type to type.
+ */
+
+/* This header has the segment type, and two specific segments
+   (character and toggle segments) */
+
+/* Information a BTree stores about a tag. */
+typedef struct _GtkTextTagInfo GtkTextTagInfo;
+struct _GtkTextTagInfo {
+  GtkTextTag *tag;
+  GtkTextBTreeNode *tag_root; /* highest-level node containing the tag */
+  int toggle_count;      /* total toggles of this tag below tag_root */
+};
+
+/* Body of a segment that toggles a tag on or off */
+struct _GtkTextToggleBody {
+  GtkTextTagInfo *info;             /* Tag that starts or ends here. */
+  gboolean inNodeCounts;             /* TRUE means this toggle has been
+                                      * accounted for in node toggle
+                                      * counts; FALSE means it hasn't, yet. */
+};
+
+
+/* Class struct for segments */
+
+/* Split seg at index, returning list of two new segments, and freeing seg */
+typedef GtkTextLineSegment* (*GtkTextSegSplitFunc)      (GtkTextLineSegment *seg,
+                                                         int                 index);
+
+/* Delete seg which is contained in line; if tree_gone, the tree is being
+ * freed in its entirety, which may matter for some reason (?)
+ * Return TRUE if the segment is not deleteable, e.g. a mark.
+ */
+typedef gboolean            (*GtkTextSegDeleteFunc)     (GtkTextLineSegment *seg,
+                                                         GtkTextLine        *line,
+                                                         gboolean            tree_gone);
+
+/* Called after segment structure of line changes, so segments can
+ * cleanup (e.g. merge with adjacent segments). Returns a segment list
+ * to replace the original segment list with. The line argument is
+ * the current line.
+ */
+typedef GtkTextLineSegment* (*GtkTextSegCleanupFunc)    (GtkTextLineSegment *seg,
+                                                         GtkTextLine        *line);
+
+/* Called when a segment moves from one line to another. CleanupFunc is also
+ * called in that case, so many segments just use CleanupFunc, I'm not sure
+ * what’s up with that (this function may not be needed...)
+ */
+typedef void                (*GtkTextSegLineChangeFunc) (GtkTextLineSegment *seg,
+                                                         GtkTextLine        *line);
+
+/* Called to do debug checks on the segment. */
+typedef void                (*GtkTextSegCheckFunc)      (GtkTextLineSegment *seg,
+                                                         GtkTextLine        *line);
+
+struct _GtkTextLineSegmentClass {
+  const char *name;                     /* Name of this kind of segment. */
+  gboolean leftGravity;                 /* If a segment has zero size (e.g. a
+                                         * mark or tag toggle), does it
+                                         * attach to character to its left
+                                         * or right?  1 means left, 0 means
+                                         * right. */
+  GtkTextSegSplitFunc splitFunc;        /* Procedure to split large segment
+                                         * into two smaller ones. */
+  GtkTextSegDeleteFunc deleteFunc;      /* Procedure to call to delete
+                                         * segment. */
+  GtkTextSegCleanupFunc cleanupFunc;   /* After any change to a line, this
+                                        * procedure is invoked for all
+                                        * segments left in the line to
+                                        * perform any cleanup they wish
+                                        * (e.g. joining neighboring
+                                        * segments). */
+  GtkTextSegLineChangeFunc lineChangeFunc;
+  /* Invoked when a segment is about
+   * to be moved from its current line
+   * to an earlier line because of
+   * a deletion.  The line is that
+   * for the segment's old line.
+   * CleanupFunc will be invoked after
+   * the deletion is finished. */
+
+  GtkTextSegCheckFunc checkFunc;       /* Called during consistency checks
+                                        * to check internal consistency of
+                                        * segment. */
+};
+
+/*
+ * The data structure below defines line segments.
+ */
+
+struct _GtkTextLineSegment {
+  const GtkTextLineSegmentClass *type;  /* Pointer to record describing
+                                         * segment's type. */
+  GtkTextLineSegment *next;             /* Next in list of segments for this
+                                         * line, or NULL for end of list. */
+
+  int char_count;                       /* # of chars of index space occupied */
+
+  int byte_count;                       /* Size of this segment (# of bytes
+                                         * of index space it occupies). */
+  union {
+    char chars[4];                      /* Characters that make up character
+                                         * info.  Actual length varies to
+                                         * hold as many characters as needed.*/
+    GtkTextToggleBody toggle;           /* Information about tag toggle. */
+    GtkTextMarkBody mark;               /* Information about mark. */
+    GtkTextPaintable paintable;         /* Child texture */
+    GtkTextChildBody child;             /* Child widget */
+  } body;
+};
+
+
+GtkTextLineSegment  *gtk_text_line_segment_split (const GtkTextIter *iter);
+
+GtkTextLineSegment *_gtk_char_segment_new                  (const char     *text,
+                                                            guint           len);
+GtkTextLineSegment *_gtk_char_segment_new_from_two_strings (const char     *text1,
+                                                            guint           len1,
+                                                           guint           chars1,
+                                                            const char     *text2,
+                                                            guint           len2,
+                                                           guint           chars2);
+GtkTextLineSegment *_gtk_toggle_segment_new                (GtkTextTagInfo *info,
+                                                            gboolean        on);
+
+void                _gtk_toggle_segment_free               (GtkTextLineSegment *seg);
+
+G_END_DECLS
+
+#endif
+
+
index 397dac13af44ba2251a7607ec36866dc62b92e03..7d28a8996f06bb76e109f50494a86e69c7ec46bd 100644 (file)
@@ -76,7 +76,7 @@
 #include <string.h>
 
 #include "gtktexttag.h"
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"
 #include "gtktexttagtable.h"
 #include "gtktexttagtableprivate.h"
 #include "gtkmarshalers.h"
index 57ce42c2c6b2f67cc149169cb18a96e45bf769fb..4092fc1532f74048c0d50edc0d92ae01562f176d 100644 (file)
@@ -26,7 +26,7 @@
 #define __GTK_TEXT_TAG_PRIVATE_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtktextattributes.h>
+#include <gtk/gtktextattributesprivate.h>
 
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 
index f9646ac9b8006fb2642bc65b88bc6fb1a864e7eb..6b5ee3c5a131c0b58c53ffddd911b73dfbc8760c 100644 (file)
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "gtktexttypes.h"
+#include "gtktexttypesprivate.h"
 
 /* These are used to represent embedded non-character objects
  * if you return a string representation of a text buffer
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
deleted file mode 100644 (file)
index 1d799ee..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktexttypes.h Copyright (C) 2000 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_TYPES_H__
-#define __GTK_TEXT_TYPES_H__
-
-#include <gtk/gtk.h>
-#include <gtk/gtktexttagprivate.h>
-
-G_BEGIN_DECLS
-
-/*
- * This is the PUBLIC representation of a text buffer.
- * GtkTextBTree is the PRIVATE internal representation of it.
- */
-
-typedef struct _GtkTextBTree GtkTextBTree;
-
-typedef struct _GtkTextCounter GtkTextCounter;
-typedef struct _GtkTextLineSegment GtkTextLineSegment;
-typedef struct _GtkTextLineSegmentClass GtkTextLineSegmentClass;
-typedef struct _GtkTextToggleBody GtkTextToggleBody;
-typedef struct _GtkTextMarkBody GtkTextMarkBody;
-
-/*
- * Declarations for variables shared among the text-related files:
- */
-
-/* In gtktextbtree.c */
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_char_type;
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_toggle_on_type;
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_toggle_off_type;
-
-/* In gtktextmark.c */
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_left_mark_type;
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_right_mark_type;
-
-/* In gtktextchild.c */
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_paintable_type;
-extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_child_type;
-
-/*
- * UTF 8 Stubs
- */
-
-#define GTK_TEXT_UNKNOWN_CHAR 0xFFFC
-#define GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN 3
-GDK_AVAILABLE_IN_ALL
-const char *gtk_text_unknown_char_utf8_gtk_tests_only (void);
-extern const char _gtk_text_unknown_char_utf8[GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN+1];
-
-GDK_AVAILABLE_IN_ALL
-gboolean gtk_text_byte_begins_utf8_char (const char *byte);
-
-G_END_DECLS
-
-#endif
-
diff --git a/gtk/gtktexttypesprivate.h b/gtk/gtktexttypesprivate.h
new file mode 100644 (file)
index 0000000..c996e18
--- /dev/null
@@ -0,0 +1,79 @@
+/* GTK - The GIMP Toolkit
+ * gtktexttypes.h Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_TEXT_TYPES_PRIVATE_H__
+#define __GTK_TEXT_TYPES_PRIVATE_H__
+
+#include <gtk/gtk.h>
+#include <gtk/gtktexttagprivate.h>
+
+G_BEGIN_DECLS
+
+/*
+ * This is the PUBLIC representation of a text buffer.
+ * GtkTextBTree is the PRIVATE internal representation of it.
+ */
+
+typedef struct _GtkTextBTree GtkTextBTree;
+
+typedef struct _GtkTextCounter GtkTextCounter;
+typedef struct _GtkTextLineSegment GtkTextLineSegment;
+typedef struct _GtkTextLineSegmentClass GtkTextLineSegmentClass;
+typedef struct _GtkTextToggleBody GtkTextToggleBody;
+typedef struct _GtkTextMarkBody GtkTextMarkBody;
+
+/*
+ * Declarations for variables shared among the text-related files:
+ */
+
+/* In gtktextbtree.c */
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_char_type;
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_toggle_on_type;
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_toggle_off_type;
+
+/* In gtktextmark.c */
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_left_mark_type;
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_right_mark_type;
+
+/* In gtktextchild.c */
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_paintable_type;
+extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_child_type;
+
+/*
+ * UTF 8 Stubs
+ */
+
+#define GTK_TEXT_UNKNOWN_CHAR 0xFFFC
+#define GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN 3
+GDK_AVAILABLE_IN_ALL
+const char *gtk_text_unknown_char_utf8_gtk_tests_only (void);
+extern const char _gtk_text_unknown_char_utf8[GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN+1];
+
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_text_byte_begins_utf8_char (const char *byte);
+
+G_END_DECLS
+
+#endif
+
index 425ae65a2b3308354fde9d67a3cf9c4cc3da3f0d..0ec6216dbeb946acc88c6ef6ac40f5ad069c2d6d 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "gtktextview.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkstylecontextprivate.h"
diff --git a/gtk/gtktextutil.h b/gtk/gtktextutil.h
deleted file mode 100644 (file)
index 512532c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_TEXT_UTIL_H__
-#define __GTK_TEXT_UTIL_H__
-
-G_BEGIN_DECLS
-
-#include "gtktextbuffer.h"
-
-/* This is a private uninstalled header shared between
- * GtkTextView and GtkEntry
- */
-
-GdkPaintable *    gtk_text_util_create_drag_icon  (GtkWidget     *widget,
-                                                   char          *text,
-                                                   gssize         len);
-GdkPaintable *    gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
-                                                   GtkTextBuffer *buffer,
-                                                   GtkTextIter   *start,
-                                                   GtkTextIter   *end);
-
-gboolean _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,
-                                                  int             index_,
-                                                  PangoRectangle *rectangle,
-                                                  gboolean       *at_line_end);
-
-G_END_DECLS
-
-#endif /* __GTK_TEXT_UTIL_H__ */
diff --git a/gtk/gtktextutilprivate.h b/gtk/gtktextutilprivate.h
new file mode 100644 (file)
index 0000000..11e47a7
--- /dev/null
@@ -0,0 +1,51 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_TEXT_UTIL_PRIVATE_H__
+#define __GTK_TEXT_UTIL_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+#include "gtktextbuffer.h"
+
+/* This is a private uninstalled header shared between
+ * GtkTextView and GtkEntry
+ */
+
+GdkPaintable *    gtk_text_util_create_drag_icon  (GtkWidget     *widget,
+                                                   char          *text,
+                                                   gssize         len);
+GdkPaintable *    gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
+                                                   GtkTextBuffer *buffer,
+                                                   GtkTextIter   *start,
+                                                   GtkTextIter   *end);
+
+gboolean _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,
+                                                  int             index_,
+                                                  PangoRectangle *rectangle,
+                                                  gboolean       *at_line_end);
+
+G_END_DECLS
+
+#endif /* __GTK_TEXT_UTIL_PRIVATE_H__ */
index 7277035dbeb5396b439728b70c6d1d36bf965606..754083b9a1e330d36f20cabb54172b8e4ca84511 100644 (file)
@@ -42,7 +42,7 @@
 #include "gtktextiterprivate.h"
 #include "gtkimmulticontext.h"
 #include "gtkprivate.h"
-#include "gtktextutil.h"
+#include "gtktextutilprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindow.h"
 #include "gtkscrollable.h"
@@ -53,7 +53,7 @@
 #include "gtkpopover.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
-#include "gtkpango.h"
+#include "gtkpangoprivate.h"
 #include "gtknative.h"
 #include "gtkwidgetprivate.h"
 #include "gtkjoinedmenuprivate.h"
index 13d9af255e18281911249d50f0069c631d672217..1cc9b791474acffedc33d3dda3bec66cc9bba075 100644 (file)
@@ -20,7 +20,7 @@
 #define __GTK_TEXT_VIEW_PRIVATE_H__
 
 #include "gtktextview.h"
-#include "gtktextattributes.h"
+#include "gtktextattributesprivate.h"
 #include "gtkcssnodeprivate.h"
 
 G_BEGIN_DECLS
index 3990d6585231e400a5e3e01fd071fcfb71fc7a6a..94dfca819bd60efab44e511c7d4bccd29837cee7 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "gtkprivate.h"
 #include "gtkmarshalers.h"
-#include "gtktrashmonitor.h"
+#include "gtktrashmonitorprivate.h"
 
 #define UPDATE_RATE_SECONDS 1
 
diff --git a/gtk/gtktrashmonitor.h b/gtk/gtktrashmonitor.h
deleted file mode 100644 (file)
index 619d5c3..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtktrashmonitor.h: Monitor the trash:/// folder to see if there is trash or not
- * Copyright (C) 2011 Suse
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Federico Mena Quintero <federico@gnome.org>
- */
-
-#ifndef __GTK_TRASH_MONITOR_H__
-#define __GTK_TRASH_MONITOR_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_TRASH_MONITOR                 (_gtk_trash_monitor_get_type ())
-#define GTK_TRASH_MONITOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitor))
-#define GTK_TRASH_MONITOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitorClass))
-#define GTK_IS_TRASH_MONITOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TRASH_MONITOR))
-#define GTK_IS_TRASH_MONITOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TRASH_MONITOR))
-#define GTK_TRASH_MONITOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitorClass))
-
-typedef struct _GtkTrashMonitor GtkTrashMonitor;
-typedef struct _GtkTrashMonitorClass GtkTrashMonitorClass;
-
-GType _gtk_trash_monitor_get_type (void);
-GtkTrashMonitor *_gtk_trash_monitor_get (void);
-
-GIcon *_gtk_trash_monitor_get_icon (GtkTrashMonitor *monitor);
-
-gboolean _gtk_trash_monitor_get_has_trash (GtkTrashMonitor *monitor);
-
-G_END_DECLS
-
-#endif /* __GTK_TRASH_MONITOR_H__ */
diff --git a/gtk/gtktrashmonitorprivate.h b/gtk/gtktrashmonitorprivate.h
new file mode 100644 (file)
index 0000000..32bdc05
--- /dev/null
@@ -0,0 +1,47 @@
+/* GTK - The GIMP Toolkit
+ * gtktrashmonitor.h: Monitor the trash:/// folder to see if there is trash or not
+ * Copyright (C) 2011 Suse
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Federico Mena Quintero <federico@gnome.org>
+ */
+
+#ifndef __GTK_TRASH_MONITOR_PRIVATE_H__
+#define __GTK_TRASH_MONITOR_PRIVATE_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_TRASH_MONITOR                 (_gtk_trash_monitor_get_type ())
+#define GTK_TRASH_MONITOR(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitor))
+#define GTK_TRASH_MONITOR_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitorClass))
+#define GTK_IS_TRASH_MONITOR(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TRASH_MONITOR))
+#define GTK_IS_TRASH_MONITOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TRASH_MONITOR))
+#define GTK_TRASH_MONITOR_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TRASH_MONITOR, GtkTrashMonitorClass))
+
+typedef struct _GtkTrashMonitor GtkTrashMonitor;
+typedef struct _GtkTrashMonitorClass GtkTrashMonitorClass;
+
+GType _gtk_trash_monitor_get_type (void);
+GtkTrashMonitor *_gtk_trash_monitor_get (void);
+
+GIcon *_gtk_trash_monitor_get_icon (GtkTrashMonitor *monitor);
+
+gboolean _gtk_trash_monitor_get_has_trash (GtkTrashMonitor *monitor);
+
+G_END_DECLS
+
+#endif /* __GTK_TRASH_MONITOR_PRIVATE_H__ */
index b5a479ad29a981d313adf89711878f9cdcb64153..4e35edbe56a0b25b4a6d3430b902e8743b9b8725 100644 (file)
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include <string.h>
 
 /* node allocation
diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h
deleted file mode 100644 (file)
index 6763117..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/* gtktreedatalist.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_TREE_DATA_LIST_H__
-#define __GTK_TREE_DATA_LIST_H__
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-
-typedef struct _GtkTreeDataList GtkTreeDataList;
-struct _GtkTreeDataList
-{
-  GtkTreeDataList *next;
-
-  union {
-    int           v_int;
-    gint8          v_char;
-    guint8         v_uchar;
-    guint         v_uint;
-    glong         v_long;
-    gulong        v_ulong;
-    gint64        v_int64;
-    guint64        v_uint64;
-    float         v_float;
-    double         v_double;
-    gpointer      v_pointer;
-  } data;
-};
-
-typedef struct _GtkTreeDataSortHeader
-{
-  int sort_column_id;
-  GtkTreeIterCompareFunc func;
-  gpointer data;
-  GDestroyNotify destroy;
-} GtkTreeDataSortHeader;
-
-GtkTreeDataList *_gtk_tree_data_list_alloc          (void);
-void             _gtk_tree_data_list_free           (GtkTreeDataList *list,
-                                                    GType           *column_headers);
-gboolean         _gtk_tree_data_list_check_type     (GType            type);
-void             _gtk_tree_data_list_node_to_value  (GtkTreeDataList *list,
-                                                    GType            type,
-                                                    GValue          *value);
-void             _gtk_tree_data_list_value_to_node  (GtkTreeDataList *list,
-                                                    GValue          *value);
-
-GtkTreeDataList *_gtk_tree_data_list_node_copy      (GtkTreeDataList *list,
-                                                     GType            type);
-
-/* Header code */
-int                    _gtk_tree_data_list_compare_func (GtkTreeModel *model,
-                                                        GtkTreeIter  *a,
-                                                        GtkTreeIter  *b,
-                                                        gpointer      user_data);
-GList *                _gtk_tree_data_list_header_new  (int           n_columns,
-                                                       GType        *types);
-void                   _gtk_tree_data_list_header_free (GList        *header_list);
-GtkTreeDataSortHeader *_gtk_tree_data_list_get_header  (GList        *header_list,
-                                                       int           sort_column_id);
-GList                 *_gtk_tree_data_list_set_header  (GList                  *header_list,
-                                                       int                     sort_column_id,
-                                                       GtkTreeIterCompareFunc  func,
-                                                       gpointer                data,
-                                                       GDestroyNotify          destroy);
-
-#endif /* __GTK_TREE_DATA_LIST_H__ */
diff --git a/gtk/gtktreedatalistprivate.h b/gtk/gtktreedatalistprivate.h
new file mode 100644 (file)
index 0000000..77aa710
--- /dev/null
@@ -0,0 +1,81 @@
+/* gtktreedatalist.h
+ * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_TREE_DATA_LIST_PRIVATE_H__
+#define __GTK_TREE_DATA_LIST_PRIVATE_H__
+
+#include <gtk/gtktreemodel.h>
+#include <gtk/gtktreesortable.h>
+
+typedef struct _GtkTreeDataList GtkTreeDataList;
+struct _GtkTreeDataList
+{
+  GtkTreeDataList *next;
+
+  union {
+    int           v_int;
+    gint8          v_char;
+    guint8         v_uchar;
+    guint         v_uint;
+    glong         v_long;
+    gulong        v_ulong;
+    gint64        v_int64;
+    guint64        v_uint64;
+    float         v_float;
+    double         v_double;
+    gpointer      v_pointer;
+  } data;
+};
+
+typedef struct _GtkTreeDataSortHeader
+{
+  int sort_column_id;
+  GtkTreeIterCompareFunc func;
+  gpointer data;
+  GDestroyNotify destroy;
+} GtkTreeDataSortHeader;
+
+GtkTreeDataList *_gtk_tree_data_list_alloc          (void);
+void             _gtk_tree_data_list_free           (GtkTreeDataList *list,
+                                                    GType           *column_headers);
+gboolean         _gtk_tree_data_list_check_type     (GType            type);
+void             _gtk_tree_data_list_node_to_value  (GtkTreeDataList *list,
+                                                    GType            type,
+                                                    GValue          *value);
+void             _gtk_tree_data_list_value_to_node  (GtkTreeDataList *list,
+                                                    GValue          *value);
+
+GtkTreeDataList *_gtk_tree_data_list_node_copy      (GtkTreeDataList *list,
+                                                     GType            type);
+
+/* Header code */
+int                    _gtk_tree_data_list_compare_func (GtkTreeModel *model,
+                                                        GtkTreeIter  *a,
+                                                        GtkTreeIter  *b,
+                                                        gpointer      user_data);
+GList *                _gtk_tree_data_list_header_new  (int           n_columns,
+                                                       GType        *types);
+void                   _gtk_tree_data_list_header_free (GList        *header_list);
+GtkTreeDataSortHeader *_gtk_tree_data_list_get_header  (GList        *header_list,
+                                                       int           sort_column_id);
+GList                 *_gtk_tree_data_list_set_header  (GList                  *header_list,
+                                                       int                     sort_column_id,
+                                                       GtkTreeIterCompareFunc  func,
+                                                       gpointer                data,
+                                                       GDestroyNotify          destroy);
+
+#endif /* __GTK_TREE_DATA_LIST_PRIVATE_H__ */
index ee4bbcfe14be0364e6e280312c19909b7214dea3..0d800da62d4bac83c7a9b6c123d6f56aecd4b0d1 100644 (file)
@@ -22,7 +22,7 @@
 #include "gtktreemodelsort.h"
 #include "gtktreesortable.h"
 #include "gtktreestore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtkprivate.h"
 #include "gtktreednd.h"
 
index 81ce21a674bbe912008bf087ca70976c08c59eb5..308f1c285395ac514bc66d3092ee18510161eb72 100644 (file)
@@ -20,7 +20,7 @@
 #include <gobject/gvaluecollector.h>
 #include "gtktreemodel.h"
 #include "gtktreestore.h"
-#include "gtktreedatalist.h"
+#include "gtktreedatalistprivate.h"
 #include "gtktreednd.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
index f500cd65f37c903d730fda5bd95365cbeec3caf1..13409314d7de0031862f820bbe95b49d1409d3d5 100644 (file)
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include "gtk/gtktexttypes.h" /* Private header, for UNKNOWN_CHAR */
+#include "gtk/gtktexttypesprivate.h" /* Private header, for UNKNOWN_CHAR */
 #include "gtk/gtktextbufferprivate.h" /* Private header */
 
 static void