Commit 2c26f0ca authored by Matthias Clasen's avatar Matthias Clasen

Complete the privatization of GtkTextAttributes

This was not quite complete, as gtktextattributes.h was still
being included in public headers.

https://bugzilla.gnome.org/show_bug.cgi?id=773903
parent e75878f9
......@@ -191,7 +191,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkSelectionData, gtk_selection_data_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTargetList, gtk_target_list_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextAttributes, gtk_text_attributes_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTextIter, gtk_text_iter_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeIter, gtk_tree_iter_free)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeRowReference, gtk_tree_row_reference_free)
......
......@@ -204,7 +204,6 @@
#include <gtk/gtkstylecontext.h>
#include <gtk/gtkstyleprovider.h>
#include <gtk/gtkswitch.h>
#include <gtk/gtktextattributes.h>
#include <gtk/gtktextbuffer.h>
#include <gtk/gtktextbufferrichtext.h>
#include <gtk/gtktextchild.h>
......
......@@ -51,10 +51,6 @@
#define __GTK_TEXT_ATTRIBUTES_H__
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
......
......@@ -29,7 +29,6 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtktextattributes.h>
#include <gtk/gtktextchild.h>
#include <gtk/gtktexttag.h>
......@@ -219,9 +218,6 @@ gint gtk_text_iter_get_chars_in_line (const GtkTextIter *iter);
GDK_AVAILABLE_IN_ALL
gint gtk_text_iter_get_bytes_in_line (const GtkTextIter *iter);
GDK_AVAILABLE_IN_ALL
gboolean gtk_text_iter_get_attributes (const GtkTextIter *iter,
GtkTextAttributes *values);
GDK_AVAILABLE_IN_ALL
PangoLanguage* gtk_text_iter_get_language (const GtkTextIter *iter);
GDK_AVAILABLE_IN_ALL
......
......@@ -31,6 +31,7 @@ G_BEGIN_DECLS
#include <gtk/gtktextiter.h>
#include <gtk/gtktextbtree.h>
#include <gtk/gtktextattributes.h>
GtkTextLineSegment *_gtk_text_iter_get_indexable_segment (const GtkTextIter *iter);
GtkTextLineSegment *_gtk_text_iter_get_any_segment (const GtkTextIter *iter);
......@@ -41,6 +42,8 @@ gboolean _gtk_text_iter_backward_indexable_segment (GtkTextIter
gint _gtk_text_iter_get_segment_byte (const GtkTextIter *iter);
gint _gtk_text_iter_get_segment_char (const GtkTextIter *iter);
gboolean gtk_text_iter_get_attributes (const GtkTextIter *iter,
GtkTextAttributes *values);
/* debug */
void _gtk_text_iter_check (const GtkTextIter *iter);
......
......@@ -89,6 +89,7 @@
#endif
#include <gtk/gtk.h>
#include <gtk/gtktextattributes.h>
G_BEGIN_DECLS
......
......@@ -26,6 +26,7 @@
#define __GTK_TEXT_TAG_PRIVATE_H__
#include <gtk/gtk.h>
#include <gtk/gtktextattributes.h>
typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
......
......@@ -45,6 +45,7 @@
#include "gtkselectionprivate.h"
#include "gtktextbufferrichtext.h"
#include "gtktextdisplay.h"
#include "gtktextiterprivate.h"
#include "gtkimmulticontext.h"
#include "gtkprivate.h"
#include "gtktextutil.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment