diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-09-14 16:41:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-09-14 16:41:20 +0000 |
| commit | 39339f14f5e9470c8007e1627517a1e7054f5fee (patch) | |
| tree | 7ed176adde69fa4e4eac2f948ae10ce51e4aad36 /gtk/gtktextbuffer.h | |
| parent | 42e44b9fa50707b9cfbfcfb51fcc88fbd3e5e2b1 (diff) | |
| download | gtk+-39339f14f5e9470c8007e1627517a1e7054f5fee.tar.gz | |
Remove g_convert (moved to glib) and now useless utf_to_latin1()
Thu Sep 14 12:21:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtktexttypes.[ch]: Remove g_convert (moved to
glib) and now useless utf_to_latin1() latin1_to_utf()
* gtk/gtktextview.[ch]: Change ::move_insert and
::delete_text action signals to ::move and ::delete;
create the signals with the right enumeration type,
not GTK_TYPE_ENUM so that bindings work. Add C-d, M-d,
C-v bindings, change Home, End to move to beginning/end
of line, Add C-Home C-End to move to beginning/end
of buffer. Change ::cut_text to ::cut_clipboard, etc;
combine ::scroll_text into ::move; use new GtkSelectionData
functions to simplify DND text handling.
* gtk/gtkenums.h gtk/gtktextview.h: Move movement,
deletion enumerations here, rename enumeration values to
be consistently plural.
* gtk/gtktextbuffer.c: Use new clipboard interfaces
for cut/copy/paste and primary selection.
* gtk/gtktextbuffer.[ch]: Remove excess time and
'interactive' arguments from cut/copy/paste;
rename cut to cut_clipboard, etc; remove
gtk_text_buffer_get_clipboard_contents().
* gtk/gtktextlayout.[ch]: Add
gtk_text_layout_move_iter_to_line_end() to move the iter to
line ends.
* gtk/gtkselection.[ch] (gtk_selection_data_set/get_text):
Functions to set or get a UTF-8 string on the selection
data.
* gtk/gtkclipboard.[ch]: New, simplified selection handling
interfaces.
* gtk/gtkinvisible.c (gtk_invisible_new): Realize newly
created widgets - one of these is useless if we don't.
* gtk/gtkselection.[ch] (gtk_selection_clear_targets): Export
a public function clear all targets registered for the
widget.
* gtk/gtkselection.c (gtk_selection_owner_set) docs/Changes-2.0.txt:
Never call gtk_widget_realize() - that was just asking
for bizarre side-effects.
* gtk/gtkselection.c (gtk_selection_owner_set): Call
gdk_selection_owner_set even if the widget is the
same so that we reliably update the timestamp on
the server.
* gdk/x11/gdkevents-x11.c gdk/x11/gdkx.h: Add a
gdk_x11_get_server_time() function.
* gdk/x11/gdkevents-x11.c gdk/x11/gdkprivate-x11.h
gdk/x11/gdkselection-x11.c gdk/x11/gdkwindow-x11.h:
Add some tricky filtering on serial numbers for
selection clear events to fix up long-standard
race condition FIXME's in gtkselection.c.
* gdk/gdkproperty.h gdk/x11/gdkselection-x11.h: Add
routines to convert from utf8 to compound text or
STRING and from a text property to UTF-8.
* gtk/gtkmain.[ch] (gtk_get_current_event_time): Add
a convenience function gdk_get_current_event_time().
* gtk/gtkselection.c (gtk_selection_data_copy/free): Copy
and free selection_data->data properly
Diffstat (limited to 'gtk/gtktextbuffer.h')
| -rw-r--r-- | gtk/gtktextbuffer.h | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index 7680294b71..b58feb62c4 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -32,18 +32,8 @@ struct _GtkTextBuffer { GtkTextTagTable *tag_table; GtkTextBTree *btree; - /* Text currently pasted to the clipboard */ - gchar *clipboard_text; - /* Whether the buffer has been modified since last save */ gboolean modified; - - /* We use this for selections */ - GtkWidget *selection_widget; - gboolean have_selection; - gboolean selection_handlers_installed; - gboolean paste_interactive; - gboolean paste_default_editable; }; struct _GtkTextBufferClass { @@ -233,33 +223,22 @@ GSList *gtk_text_buffer_get_tags (GtkTextBuffer *buffer, gboolean gtk_text_buffer_modified (GtkTextBuffer *buffer); void gtk_text_buffer_set_modified (GtkTextBuffer *buffer, gboolean setting); -void gtk_text_buffer_set_clipboard_contents (GtkTextBuffer *buffer, - const gchar *text); -const gchar *gtk_text_buffer_get_clipboard_contents (GtkTextBuffer *buffer); - -void gtk_text_buffer_paste_primary_selection (GtkTextBuffer *buffer, +void gtk_text_buffer_paste_primary (GtkTextBuffer *buffer, GtkTextIter *override_location, - guint32 time, - gboolean interactive, - gboolean default_editable); -gboolean gtk_text_buffer_delete_selection (GtkTextBuffer *buffer, - gboolean interactive, gboolean default_editable); -void gtk_text_buffer_cut (GtkTextBuffer *buffer, - guint32 time, - gboolean interactive, +void gtk_text_buffer_cut_clipboard (GtkTextBuffer *buffer, gboolean default_editable); -void gtk_text_buffer_copy (GtkTextBuffer *buffer, - guint32 time); +void gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer); void gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer, - guint32 time, - gboolean interactive, gboolean default_editable); + gboolean gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end); - +gboolean gtk_text_buffer_delete_selection (GtkTextBuffer *buffer, + gboolean interactive, + gboolean default_editable); /* This function is not implemented. */ gboolean gtk_text_buffer_find_string(GtkTextBuffer *buffer, |