fix other typo
2001-06-14 Havoc Pennington <hp@redhat.com> * gtk/gtkwindow.c (window_group_cleanup_grabs): fix other typo * gtk/gtkwidget.c (gtk_widget_propagate_state): fix typo * gtk/gtktextbtree.c: don't leak node data all over the place. * demos/gtk-demo/main.c (main): create fontify tags for the right buffer * gtk/gtktextbuffer.c, gtk/gtktexttagtable.c: enhance docs to mention tags in the same table can't have the same name, suggested by Skip Montanaro 2001-06-11 Havoc Pennington <hp@redhat.com> * gtk/gtktexttagtable.c (gtk_text_tag_table_add): improve warning for trying to add two tags with same name to the tag table * demos/gtk-demo/main.c (main): fix colors ;-)
This commit is contained in:
Havoc Pennington
committed by
Havoc Pennington
Havoc Pennington
parent
cf2fab9077
commit
a002196773
@ -458,7 +458,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
|
||||
{
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
|
||||
|
||||
_gtk_text_btree_insert (iter, text, len);
|
||||
|
||||
g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
|
||||
@ -511,7 +511,8 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
g_return_if_fail (text != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
gtk_text_buffer_emit_insert (buffer, iter, text, len);
|
||||
}
|
||||
|
||||
@ -569,6 +570,7 @@ gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
|
||||
{
|
||||
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
|
||||
g_return_val_if_fail (text != NULL, FALSE);
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, FALSE);
|
||||
|
||||
if (gtk_text_iter_editable (iter, default_editable))
|
||||
{
|
||||
@ -936,7 +938,8 @@ gtk_text_buffer_insert_range (GtkTextBuffer *buffer,
|
||||
gtk_text_iter_get_buffer (end));
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start)->tag_table ==
|
||||
buffer->tag_table);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
gtk_text_buffer_real_insert_range (buffer, iter, start, end, FALSE);
|
||||
}
|
||||
|
||||
@ -1013,7 +1016,8 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
g_return_if_fail (text != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
start_offset = gtk_text_iter_get_offset (iter);
|
||||
|
||||
gtk_text_buffer_insert (buffer, iter, text, len);
|
||||
@ -1063,7 +1067,8 @@ gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
g_return_if_fail (text != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
start_offset = gtk_text_iter_get_offset (iter);
|
||||
|
||||
gtk_text_buffer_insert (buffer, iter, text, len);
|
||||
@ -1174,7 +1179,9 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
|
||||
gtk_text_buffer_emit_delete (buffer, start, end);
|
||||
}
|
||||
|
||||
@ -1210,7 +1217,10 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
|
||||
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
|
||||
g_return_val_if_fail (start_iter != NULL, FALSE);
|
||||
g_return_val_if_fail (end_iter != NULL, FALSE);
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (start_iter) == buffer, FALSE);
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (end_iter) == buffer, FALSE);
|
||||
|
||||
|
||||
gtk_text_buffer_begin_user_action (buffer);
|
||||
|
||||
gtk_text_iter_order (start_iter, end_iter);
|
||||
@ -1341,7 +1351,9 @@ gtk_text_buffer_get_text (GtkTextBuffer *buffer,
|
||||
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
|
||||
g_return_val_if_fail (start != NULL, NULL);
|
||||
g_return_val_if_fail (end != NULL, NULL);
|
||||
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (start) == buffer, NULL);
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (end) == buffer, NULL);
|
||||
|
||||
if (include_hidden_chars)
|
||||
return gtk_text_iter_get_text (start, end);
|
||||
else
|
||||
@ -1377,7 +1389,9 @@ gtk_text_buffer_get_slice (GtkTextBuffer *buffer,
|
||||
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
|
||||
g_return_val_if_fail (start != NULL, NULL);
|
||||
g_return_val_if_fail (end != NULL, NULL);
|
||||
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (start) == buffer, NULL);
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (end) == buffer, NULL);
|
||||
|
||||
if (include_hidden_chars)
|
||||
return gtk_text_iter_get_slice (start, end);
|
||||
else
|
||||
@ -1392,7 +1406,7 @@ static void
|
||||
gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
GdkPixbuf *pixbuf)
|
||||
{
|
||||
{
|
||||
_gtk_text_btree_insert_pixbuf (iter, pixbuf);
|
||||
|
||||
g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
|
||||
@ -1422,7 +1436,8 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
g_signal_emit (G_OBJECT (buffer), signals[INSERT_PIXBUF], 0,
|
||||
iter, pixbuf);
|
||||
}
|
||||
@ -1469,6 +1484,7 @@ gtk_text_buffer_insert_child_anchor (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (iter != NULL);
|
||||
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
|
||||
|
||||
g_signal_emit (G_OBJECT (buffer), signals[INSERT_CHILD_ANCHOR], 0,
|
||||
iter, anchor);
|
||||
@ -1494,7 +1510,8 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
|
||||
|
||||
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
|
||||
g_return_val_if_fail (iter != NULL, NULL);
|
||||
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, NULL);
|
||||
|
||||
anchor = gtk_text_child_anchor_new ();
|
||||
|
||||
gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
|
||||
@ -1559,13 +1576,15 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
|
||||
GtkTextIter location;
|
||||
GtkTextMark *mark;
|
||||
|
||||
g_return_val_if_fail (gtk_text_iter_get_buffer (iter) == buffer, NULL);
|
||||
|
||||
mark = _gtk_text_btree_set_mark (get_btree (buffer),
|
||||
existing_mark,
|
||||
mark_name,
|
||||
left_gravity,
|
||||
iter,
|
||||
should_exist);
|
||||
|
||||
existing_mark,
|
||||
mark_name,
|
||||
left_gravity,
|
||||
iter,
|
||||
should_exist);
|
||||
|
||||
if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
|
||||
_gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
|
||||
{
|
||||
@ -1659,8 +1678,8 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
|
||||
_gtk_text_btree_get_iter_at_mark (get_btree (buffer),
|
||||
iter,
|
||||
mark);
|
||||
iter,
|
||||
mark);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1900,6 +1919,9 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
|
||||
*
|
||||
* If @tag_name is %NULL, the tag is anonymous.
|
||||
*
|
||||
* If @tag_name is non-%NULL, a tag called @tag_name must not already
|
||||
* exist in the tag table for this buffer.
|
||||
*
|
||||
* The @first_property_name argument and subsequent arguments are a list
|
||||
* of properties to set on the tag, as with g_object_set().
|
||||
*
|
||||
@ -1936,6 +1958,12 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
|
||||
const GtkTextIter *start,
|
||||
const GtkTextIter *end)
|
||||
{
|
||||
if (tag->table != buffer->tag_table)
|
||||
{
|
||||
g_warning ("Can only apply tags that are in the tag table for the buffer");
|
||||
return;
|
||||
}
|
||||
|
||||
_gtk_text_btree_tag (start, end, tag, TRUE);
|
||||
}
|
||||
|
||||
@ -1945,6 +1973,12 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
|
||||
const GtkTextIter *start,
|
||||
const GtkTextIter *end)
|
||||
{
|
||||
if (tag->table != buffer->tag_table)
|
||||
{
|
||||
g_warning ("Can only remove tags that are in the tag table for the buffer");
|
||||
return;
|
||||
}
|
||||
|
||||
_gtk_text_btree_tag (start, end, tag, FALSE);
|
||||
}
|
||||
|
||||
@ -2001,7 +2035,10 @@ gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_TAG (tag));
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
g_return_if_fail (tag->table == buffer->tag_table);
|
||||
|
||||
gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
|
||||
}
|
||||
|
||||
@ -2028,7 +2065,10 @@ gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_TAG (tag));
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
g_return_if_fail (tag->table == buffer->tag_table);
|
||||
|
||||
gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
|
||||
}
|
||||
|
||||
@ -2056,6 +2096,8 @@ gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (name != NULL);
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
|
||||
tag = gtk_text_tag_table_lookup (get_table (buffer),
|
||||
name);
|
||||
@ -2093,7 +2135,9 @@ gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (name != NULL);
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
|
||||
tag = gtk_text_tag_table_lookup (get_table (buffer),
|
||||
name);
|
||||
|
||||
@ -2144,6 +2188,8 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer *buffer,
|
||||
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
|
||||
g_return_if_fail (start != NULL);
|
||||
g_return_if_fail (end != NULL);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
|
||||
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
|
||||
|
||||
first = *start;
|
||||
second = *end;
|
||||
|
||||
Reference in New Issue
Block a user