Add warnings if you try to use a child anchor that isn't inside a buffer.

2002-02-06  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextchild.c: Add warnings if you try to use a child
	anchor that isn't inside a buffer. Really kind of lame;
	we should separate the anchor from the buffer. But not worth
	fixing for now. #70601
This commit is contained in:
Havoc Pennington 2002-02-06 22:07:47 +00:00 committed by Havoc Pennington
parent 2d1b1a623c
commit 99b7d4a189
8 changed files with 62 additions and 0 deletions

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -1,3 +1,10 @@
2002-02-06 Havoc Pennington <hp@redhat.com>
* gtk/gtktextchild.c: Add warnings if you try to use a child
anchor that isn't inside a buffer. Really kind of lame;
we should separate the anchor from the buffer. But not worth
fixing for now. #70601
Wed Feb 6 18:25:24 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c: rip out all the debugging ifdefs, as

View File

@ -52,6 +52,9 @@
#include "gtktextbtree.h"
#include "gtktextlayout.h"
#define CHECK_IN_BUFFER(anchor) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", __FUNCTION__); } while (0)
#define CHECK_IN_BUFFER_RETURN(anchor, val) do { if ((anchor)->segment == NULL) g_warning ("%s: GtkTextChildAnchor hasn't been in a buffer yet", __FUNCTION__); return (val); } while (0)
static GtkTextLineSegment *
pixbuf_segment_cleanup_func (GtkTextLineSegment *seg,
GtkTextLine *line)
@ -402,6 +405,8 @@ gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor)
GList *list = NULL;
GSList *iter;
CHECK_IN_BUFFER_RETURN (anchor, NULL);
g_return_val_if_fail (seg->type = &gtk_text_child_type, NULL);
iter = seg->body.child.widgets;
@ -436,6 +441,8 @@ gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = anchor->segment;
CHECK_IN_BUFFER_RETURN (anchor, TRUE);
g_return_val_if_fail (seg->type = &gtk_text_child_type, TRUE);
return seg->body.child.tree == NULL;
@ -449,6 +456,8 @@ gtk_text_child_anchor_register_child (GtkTextChildAnchor *anchor,
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (GTK_IS_WIDGET (child));
CHECK_IN_BUFFER (anchor);
_gtk_anchored_child_set_layout (child, layout);
_gtk_widget_segment_add (anchor->segment, child);
@ -463,6 +472,8 @@ gtk_text_child_anchor_unregister_child (GtkTextChildAnchor *anchor,
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (GTK_IS_WIDGET (child));
CHECK_IN_BUFFER (anchor);
if (_gtk_anchored_child_get_layout (child))
{
gtk_text_child_anchor_queue_resize (anchor,
@ -484,6 +495,8 @@ gtk_text_child_anchor_queue_resize (GtkTextChildAnchor *anchor,
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
CHECK_IN_BUFFER (anchor);
seg = anchor->segment;