X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextbuffer.h;h=793b7635ac639f6115d3ae41b1280392ea70abf5;hb=bb3c56abe2e7916126bd4f8234dee080b5381941;hp=d49f9db973b2d4e02f4b5f79351707484eb11722;hpb=fce9c8b7d45145c4556650843218e0b76c065c18;p=~andy%2Fgtk
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index d49f9db97..793b7635a 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
* gtktextbuffer.h Copyright (C) 2000 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -12,9 +12,7 @@
* 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -24,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
#ifndef __GTK_TEXT_BUFFER_H__
#define __GTK_TEXT_BUFFER_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only can be included directly."
+#endif
+
#include
#include
#include
@@ -60,8 +58,6 @@ typedef enum
typedef struct _GtkTextBTree GtkTextBTree;
-typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
-
#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type ())
#define GTK_TEXT_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
#define GTK_TEXT_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
@@ -69,26 +65,14 @@ typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
#define GTK_IS_TEXT_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TEXT_BUFFER))
#define GTK_TEXT_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
+typedef struct _GtkTextBufferPrivate GtkTextBufferPrivate;
typedef struct _GtkTextBufferClass GtkTextBufferClass;
struct _GtkTextBuffer
{
GObject parent_instance;
- GtkTextTagTable *GSEAL (tag_table);
- GtkTextBTree *GSEAL (btree);
-
- GSList *GSEAL (clipboard_contents_buffers);
- GSList *GSEAL (selection_clipboards);
-
- GtkTextLogAttrCache *GSEAL (log_attr_cache);
-
- guint GSEAL (user_action_count);
-
- /* Whether the buffer has been modified since last save */
- guint GSEAL (modified) : 1;
-
- guint GSEAL (has_selection) : 1;
+ GtkTextBufferPrivate *priv;
};
struct _GtkTextBufferClass
@@ -97,15 +81,15 @@ struct _GtkTextBufferClass
void (* insert_text) (GtkTextBuffer *buffer,
GtkTextIter *pos,
- const gchar *text,
- gint length);
+ const gchar *new_text,
+ gint new_text_length);
void (* insert_pixbuf) (GtkTextBuffer *buffer,
- GtkTextIter *pos,
+ GtkTextIter *iter,
GdkPixbuf *pixbuf);
void (* insert_child_anchor) (GtkTextBuffer *buffer,
- GtkTextIter *pos,
+ GtkTextIter *iter,
GtkTextChildAnchor *anchor);
void (* delete_range) (GtkTextBuffer *buffer,
@@ -131,25 +115,26 @@ struct _GtkTextBufferClass
void (* apply_tag) (GtkTextBuffer *buffer,
GtkTextTag *tag,
- const GtkTextIter *start_char,
- const GtkTextIter *end_char);
+ const GtkTextIter *start,
+ const GtkTextIter *end);
void (* remove_tag) (GtkTextBuffer *buffer,
GtkTextTag *tag,
- const GtkTextIter *start_char,
- const GtkTextIter *end_char);
+ const GtkTextIter *start,
+ const GtkTextIter *end);
/* Called at the start and end of an atomic user action */
void (* begin_user_action) (GtkTextBuffer *buffer);
void (* end_user_action) (GtkTextBuffer *buffer);
+ void (* paste_done) (GtkTextBuffer *buffer,
+ GtkClipboard *clipboard);
+
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
- void (*_gtk_reserved5) (void);
- void (*_gtk_reserved6) (void);
};
GType gtk_text_buffer_get_type (void) G_GNUC_CONST;
@@ -402,6 +387,22 @@ const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buff
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