[gtk+] Split off a private header for GtkTextBuffer



commit c264cd67853f006538a4022d0c3b7f2bba9a8dab
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 15 23:04:44 2015 -0400

    Split off a private header for GtkTextBuffer
    
    This avoids polluting the installed header with private symbols.

 gtk/Makefile.am                  |    1 +
 gtk/a11y/gtktextviewaccessible.c |    1 +
 gtk/gtktextbtree.c               |    1 +
 gtk/gtktextbuffer.c              |    1 +
 gtk/gtktextbuffer.h              |   27 ------------------
 gtk/gtktextbufferprivate.h       |   55 ++++++++++++++++++++++++++++++++++++++
 gtk/gtktextiter.c                |    1 +
 gtk/gtktextlayout.c              |    1 +
 gtk/gtktexttagtable.c            |    2 +-
 9 files changed, 62 insertions(+), 28 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 88e30f8..83b3cd2 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -515,6 +515,7 @@ gtk_private_h_sources =             \
        gtkstyleproviderprivate.h \
        gtktextattributesprivate.h \
        gtktextbtree.h          \
+       gtktextbufferprivate.h \
        gtktextbufferserialize.h \
        gtktextchildprivate.h   \
        gtktexthandleprivate.h  \
diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c
index f97c155..4adff0c 100644
--- a/gtk/a11y/gtktextviewaccessible.c
+++ b/gtk/a11y/gtktextviewaccessible.c
@@ -29,6 +29,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "gtktextviewaccessibleprivate.h"
+#include "gtktextbufferprivate.h"
 #include "gtk/gtkwidgetprivate.h"
 
 struct _GtkTextViewAccessiblePrivate
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index b7c54b0..2528730 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -58,6 +58,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include "gtktextbufferprivate.h"
 #include "gtktexttag.h"
 #include "gtktexttagprivate.h"
 #include "gtktexttagtable.h"
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 1bf1b68..e45f445 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -33,6 +33,7 @@
 #include "gtkinvisible.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextbufferrichtext.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 9227be8..3183d3c 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -468,33 +468,6 @@ GtkTargetList * gtk_text_buffer_get_copy_target_list    (GtkTextBuffer *buffer);
 GDK_AVAILABLE_IN_ALL
 GtkTargetList * gtk_text_buffer_get_paste_target_list   (GtkTextBuffer *buffer);
 
-/* INTERNAL private stuff */
-void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
-
-GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
-
-const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
-                                                         const GtkTextIter *anywhere_in_line,
-                                                         gint              *char_len);
-
-void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
-                                              GtkTextTag    *tag);
-
-void _gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
-void _gtk_text_buffer_get_text_at     (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
-void _gtk_text_buffer_get_text_after  (GtkTextBuffer   *buffer,
-                                       AtkTextBoundary  boundary_type,
-                                       GtkTextIter     *position,
-                                       GtkTextIter     *start,
-                                       GtkTextIter     *end);
 
 G_END_DECLS
 
diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h
new file mode 100644
index 0000000..8d8363c
--- /dev/null
+++ b/gtk/gtktextbufferprivate.h
@@ -0,0 +1,55 @@
+/* GTK - The GIMP Toolkit
+ * gtktextbufferprivate.h Copyright (C) 2015 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 __GTK_TEXT_BUFFER_PRIVATE_H__
+#define __GTK_TEXT_BUFFER_PRIVATE_H__
+
+#include <gtk/gtktextbuffer.h>
+
+G_BEGIN_DECLS
+
+
+void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
+
+GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
+
+const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
+                                                         const GtkTextIter *anywhere_in_line,
+                                                         gint              *char_len);
+
+void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
+                                              GtkTextTag    *tag);
+
+void _gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+void _gtk_text_buffer_get_text_at     (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+void _gtk_text_buffer_get_text_after  (GtkTextBuffer   *buffer,
+                                       AtkTextBoundary  boundary_type,
+                                       GtkTextIter     *position,
+                                       GtkTextIter     *start,
+                                       GtkTextIter     *end);
+
+G_END_DECLS
+
+#endif
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index 6b31c64..a863c38 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "gtktextiter.h"
 #include "gtktextbtree.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtkintl.h"
 #include "gtkdebug.h"
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index ffba509..e6a4ab9 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -80,6 +80,7 @@
 #include "gtkmarshalers.h"
 #include "gtktextlayout.h"
 #include "gtktextbtree.h"
+#include "gtktextbufferprivate.h"
 #include "gtktextiterprivate.h"
 #include "gtktextattributesprivate.h"
 #include "gtktextutil.h"
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index 777cf31..42569cf 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -29,7 +29,7 @@
 #include "gtkbuildable.h"
 #include "gtktexttagprivate.h"
 #include "gtkmarshalers.h"
-#include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
+#include "gtktextbufferprivate.h" /* just for the lame notify_will_remove_tag hack */
 #include "gtkintl.h"
 
 #include <stdlib.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]