Commit 244996ff authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington
Browse files

fix indentation

2000-09-29  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation

        * gtk/gtktextview.c: Implement drag thresholding; change functions
	that set border window size to have nicer name
	(gtk_text_view_mark_set_handler):  Fix this to have the
	right signature.

	* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes

	* gtk/testtext.c: Update with API changes, put line numbers on
	both sides.

	* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
	with this

	* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
	pixbuf; delete a big block of #if 0 Tk code

	* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
	insert_pixmap with insert_pixbuf
parent 0415b69e
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
2000-09-29 Havoc Pennington <hp@redhat.com>
* gtk/gtktexttag.c (gtk_text_tag_set_priority): fix indentation
* gtk/gtktextview.c: Implement drag thresholding; change functions
that set border window size to have nicer name
(gtk_text_view_mark_set_handler): Fix this to have the
right signature.
* gtk/testtextbuffer.c (fill_buffer): Update with pixbuf changes
* gtk/testtext.c: Update with API changes, put line numbers on
both sides.
* gtk/gtktextiter.c (gtk_text_iter_get_pixbuf): Replace get_pixmap
with this
* gtk/gtktextchild.h, gtk/gtktextchild.c: replace all pixmap with
pixbuf; delete a big block of #if 0 Tk code
* gtk/gtktextbuffer.c (gtk_text_buffer_insert_pixbuf): Replace
insert_pixmap with insert_pixbuf
2000-09-29 Martin Baulig <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
* Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig';
......
...@@ -1043,9 +1043,8 @@ gtk_text_btree_insert (GtkTextIter *iter, ...@@ -1043,9 +1043,8 @@ gtk_text_btree_insert (GtkTextIter *iter,
} }
void void
gtk_text_btree_insert_pixmap (GtkTextIter *iter, gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GdkPixmap *pixmap, GdkPixbuf *pixbuf)
GdkBitmap *mask)
{ {
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
GtkTextIter start; GtkTextIter start;
...@@ -1058,7 +1057,7 @@ gtk_text_btree_insert_pixmap (GtkTextIter *iter, ...@@ -1058,7 +1057,7 @@ gtk_text_btree_insert_pixmap (GtkTextIter *iter,
tree = gtk_text_iter_get_btree(iter); tree = gtk_text_iter_get_btree(iter);
start_byte_offset = gtk_text_iter_get_line_index(iter); start_byte_offset = gtk_text_iter_get_line_index(iter);
seg = gtk_text_pixmap_segment_new (pixmap, mask); seg = gtk_text_pixbuf_segment_new (pixbuf);
prevPtr = gtk_text_line_segment_split(iter); prevPtr = gtk_text_line_segment_split(iter);
if (prevPtr == NULL) if (prevPtr == NULL)
...@@ -2037,7 +2036,7 @@ copy_segment(GString *string, ...@@ -2037,7 +2036,7 @@ copy_segment(GString *string,
/* printf(" :%s\n", string->str); */ /* printf(" :%s\n", string->str); */
} }
else if (seg->type == &gtk_text_pixmap_type) else if (seg->type == &gtk_text_pixbuf_type)
{ {
gboolean copy = TRUE; gboolean copy = TRUE;
...@@ -3401,7 +3400,7 @@ gtk_text_line_byte_to_char (GtkTextLine *line, ...@@ -3401,7 +3400,7 @@ gtk_text_line_byte_to_char (GtkTextLine *line,
gint gint
gtk_text_line_char_to_byte (GtkTextLine *line, gtk_text_line_char_to_byte (GtkTextLine *line,
gint char_offset) gint char_offset)
{ {
g_warning("FIXME not implemented"); g_warning("FIXME not implemented");
} }
......
...@@ -31,9 +31,8 @@ void gtk_text_btree_delete (GtkTextIter *start, ...@@ -31,9 +31,8 @@ void gtk_text_btree_delete (GtkTextIter *start,
void gtk_text_btree_insert (GtkTextIter *iter, void gtk_text_btree_insert (GtkTextIter *iter,
const gchar *text, const gchar *text,
gint len); gint len);
void gtk_text_btree_insert_pixmap (GtkTextIter *iter, void gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GdkPixmap *pixmap, GdkPixbuf *pixbuf);
GdkBitmap *mask);
......
...@@ -787,22 +787,21 @@ gtk_text_buffer_get_slice (GtkTextBuffer *buffer, ...@@ -787,22 +787,21 @@ gtk_text_buffer_get_slice (GtkTextBuffer *buffer,
*/ */
void void
gtk_text_buffer_insert_pixmap (GtkTextBuffer *buffer, gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
GtkTextIter *iter, GtkTextIter *iter,
GdkPixmap *pixmap, GdkPixbuf *pixbuf)
GdkBitmap *mask)
{ {
g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer)); g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
g_return_if_fail(iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail(pixmap != NULL); g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
gtk_text_btree_insert_pixmap(iter, pixmap, mask); gtk_text_btree_insert_pixbuf (iter, pixbuf);
/* FIXME pixmap-specific signal like insert_text */ /* FIXME pixbuf-specific signal like insert_text */
gtk_signal_emit(GTK_OBJECT(buffer), signals[CHANGED]); gtk_signal_emit (GTK_OBJECT(buffer), signals[CHANGED]);
gtk_text_buffer_set_modified(buffer, TRUE); gtk_text_buffer_set_modified (buffer, TRUE);
} }
/* /*
...@@ -977,6 +976,22 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer, ...@@ -977,6 +976,22 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
return mark; return mark;
} }
GtkTextMark*
gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
{
g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
return gtk_text_buffer_get_mark (buffer, "insert");
}
GtkTextMark*
gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer)
{
g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
return gtk_text_buffer_get_mark (buffer, "selection_bound");
}
/** /**
* gtk_text_buffer_place_cursor: * gtk_text_buffer_place_cursor:
* @buffer: a #GtkTextBuffer * @buffer: a #GtkTextBuffer
......
...@@ -133,11 +133,10 @@ gchar *gtk_text_buffer_get_slice (GtkTextBuffer *buffer, ...@@ -133,11 +133,10 @@ gchar *gtk_text_buffer_get_slice (GtkTextBuffer *buffer,
const GtkTextIter *end, const GtkTextIter *end,
gboolean include_hidden_chars); gboolean include_hidden_chars);
/* Insert a pixmap */ /* Insert a pixbuf */
void gtk_text_buffer_insert_pixmap (GtkTextBuffer *buffer, void gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
GtkTextIter *iter, GtkTextIter *iter,
GdkPixmap *pixmap, GdkPixbuf *pixbuf);
GdkBitmap *mask);
/* Mark manipulation */ /* Mark manipulation */
GtkTextMark *gtk_text_buffer_create_mark (GtkTextBuffer *buffer, GtkTextMark *gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
...@@ -149,9 +148,12 @@ void gtk_text_buffer_move_mark (GtkTextBuffer *buffer, ...@@ -149,9 +148,12 @@ void gtk_text_buffer_move_mark (GtkTextBuffer *buffer,
const GtkTextIter *where); const GtkTextIter *where);
void gtk_text_buffer_delete_mark (GtkTextBuffer *buffer, void gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
GtkTextMark *mark); GtkTextMark *mark);
GtkTextMark *gtk_text_buffer_get_mark (GtkTextBuffer *buffer, GtkTextMark* gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
const gchar *name); const gchar *name);
GtkTextMark* gtk_text_buffer_get_insert (GtkTextBuffer *buffer);
GtkTextMark* gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer);
/* efficiently move insert and selection_bound to same location */ /* efficiently move insert and selection_bound to same location */
void gtk_text_buffer_place_cursor (GtkTextBuffer *buffer, void gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
......
This diff is collapsed.
...@@ -7,14 +7,13 @@ ...@@ -7,14 +7,13 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef struct _GtkTextPixmap GtkTextPixmap; typedef struct _GtkTextPixbuf GtkTextPixbuf;
struct _GtkTextPixmap { struct _GtkTextPixbuf {
GdkPixmap *pixmap; GdkPixbuf *pixbuf;
GdkBitmap *mask;
}; };
GtkTextLineSegment *gtk_text_pixmap_segment_new(GdkPixmap *pixmap, GdkBitmap *mask); GtkTextLineSegment *gtk_text_pixbuf_segment_new(GdkPixbuf *pixbuf);
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -159,7 +159,7 @@ static void ...@@ -159,7 +159,7 @@ static void
render_layout_line (GdkDrawable *drawable, render_layout_line (GdkDrawable *drawable,
GtkTextRenderState *render_state, GtkTextRenderState *render_state,
PangoLayoutLine *line, PangoLayoutLine *line,
GSList **pixmap_pointer, GSList **pixbuf_pointer,
int x, int x,
int y, int y,
gboolean selected) gboolean selected)
...@@ -246,37 +246,67 @@ render_layout_line (GdkDrawable *drawable, ...@@ -246,37 +246,67 @@ render_layout_line (GdkDrawable *drawable,
x_off += logical_rect.width; x_off += logical_rect.width;
} }
else /* Pixmap segment */ else /* Pixbuf segment */
{ {
GtkTextPixmap *pixmap = (*pixmap_pointer)->data; GtkTextPixbuf *pixbuf = (*pixbuf_pointer)->data;
gint width, height; gint width, height;
GdkRectangle pixmap_rect, draw_rect; GdkRectangle pixbuf_rect, draw_rect;
GdkBitmap *mask = NULL;
*pixmap_pointer = (*pixmap_pointer)->next;
*pixbuf_pointer = (*pixbuf_pointer)->next;
gdk_drawable_get_size (pixmap->pixmap, &width, &height);
width = gdk_pixbuf_get_width (pixbuf->pixbuf);
pixmap_rect.x = x + x_off / PANGO_SCALE; height = gdk_pixbuf_get_height (pixbuf->pixbuf);
pixmap_rect.y = y - height;
pixmap_rect.width = width; pixbuf_rect.x = x + x_off / PANGO_SCALE;
pixmap_rect.height = height; pixbuf_rect.y = y - height;
pixbuf_rect.width = width;
gdk_rectangle_intersect (&pixmap_rect, &render_state->clip_rect, &draw_rect); pixbuf_rect.height = height;
if (pixmap->mask) if (gdk_rectangle_intersect (&pixbuf_rect, &render_state->clip_rect,
{ &draw_rect))
gdk_gc_set_clip_mask (render_state->fg_gc, pixmap->mask); {
gdk_gc_set_clip_origin (render_state->fg_gc, if (gdk_pixbuf_get_has_alpha (pixbuf->pixbuf))
pixmap_rect.x, pixmap_rect.y); {
} mask = gdk_pixmap_new (drawable,
gdk_pixbuf_get_width (pixbuf->pixbuf),
gdk_draw_drawable (drawable, render_state->fg_gc, pixmap->pixmap, gdk_pixbuf_get_height (pixbuf->pixbuf),
draw_rect.x - pixmap_rect.x, draw_rect.y - pixmap_rect.y, 1);
draw_rect.x, draw_rect.y, draw_rect.width, draw_rect.height);
gdk_pixbuf_render_threshold_alpha (pixbuf->pixbuf, mask,
if (pixmap->mask) 0, 0, 0, 0,
gdk_gc_set_clip_rectangle (render_state->fg_gc, &render_state->clip_rect); gdk_pixbuf_get_width (pixbuf->pixbuf),
gdk_pixbuf_get_height (pixbuf->pixbuf),
128);
}
if (mask)
{
gdk_gc_set_clip_mask (render_state->fg_gc, mask);
gdk_gc_set_clip_origin (render_state->fg_gc,
pixbuf_rect.x, pixbuf_rect.y);
}
gdk_pixbuf_render_to_drawable (pixbuf->pixbuf,
drawable,
render_state->fg_gc,
draw_rect.x - pixbuf_rect.x,
draw_rect.y - pixbuf_rect.y,
draw_rect.x, draw_rect.y,
draw_rect.width,
draw_rect.height,
GDK_RGB_DITHER_NORMAL,
0, 0);
if (mask)
{
gdk_gc_set_clip_rectangle (render_state->fg_gc,
&render_state->clip_rect);
g_object_unref (G_OBJECT (mask));
}
}
x_off += width * PANGO_SCALE; x_off += width * PANGO_SCALE;
} }
} }
...@@ -292,7 +322,7 @@ render_para (GdkDrawable *drawable, ...@@ -292,7 +322,7 @@ render_para (GdkDrawable *drawable,
int selection_end_index) int selection_end_index)
{ {
PangoRectangle logical_rect; PangoRectangle logical_rect;
GSList *pixmap_pointer = line_display->pixmaps; GSList *pixbuf_pointer = line_display->pixbufs;
GSList *tmp_list; GSList *tmp_list;
PangoAlignment align; PangoAlignment align;
PangoLayout *layout = line_display->layout; PangoLayout *layout = line_display->layout;
...@@ -375,15 +405,15 @@ render_para (GdkDrawable *drawable, ...@@ -375,15 +405,15 @@ render_para (GdkDrawable *drawable,
TRUE, TRUE,
x + line_display->left_margin, selection_y, x + line_display->left_margin, selection_y,
total_width / PANGO_SCALE, selection_height); total_width / PANGO_SCALE, selection_height);
render_layout_line (drawable, render_state, line, &pixmap_pointer, render_layout_line (drawable, render_state, line, &pixbuf_pointer,
x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE, x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
TRUE); TRUE);
} }
else else
{ {
GSList *pixmap_pointer_tmp = pixmap_pointer; GSList *pixbuf_pointer_tmp = pixbuf_pointer;
render_layout_line (drawable, render_state, line, &pixmap_pointer, render_layout_line (drawable, render_state, line, &pixbuf_pointer,
x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE, x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
FALSE); FALSE);
...@@ -405,7 +435,7 @@ render_para (GdkDrawable *drawable, ...@@ -405,7 +435,7 @@ render_para (GdkDrawable *drawable,
logical_rect.width / PANGO_SCALE, logical_rect.width / PANGO_SCALE,
selection_height); selection_height);
render_layout_line (drawable, render_state, line, &pixmap_pointer_tmp, render_layout_line (drawable, render_state, line, &pixbuf_pointer_tmp,
x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE, x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
TRUE); TRUE);
......
...@@ -794,34 +794,21 @@ gtk_text_iter_get_visible_text (const GtkTextIter *start, ...@@ -794,34 +794,21 @@ gtk_text_iter_get_visible_text (const GtkTextIter *start,
} }
/** /**
* gtk_text_iter_get_pixmap: * gtk_text_iter_get_pixbuf:
* @iter: an iterator * @iter: an iterator
* @pixmap: return location for the pixmap *
* @mask: return location for the mask * If the location pointed to by @iter contains a pixbuf, the pixbuf
* * is returned (with no new reference count added). Otherwise,
* If the location pointed to by @iter contains a pixmap, the pixmap * NULL is returned.
* is placed in @pixmap, the mask is placed in @mask, and *
* gtk_text_iter_get_pixmap() returns TRUE. If @iter points at * Return value: the pixbuf at @iter
* something else, FALSE will be returned and @pixmap/@mask will
* remain unchanged. The pixmap and mask do not have their reference
* count incremented. If the pixmap has no mask, NULL is returned for
* the mask.
*
* Return value: whether the iterator pointed at a pixmap
**/ **/
gboolean GdkPixbuf*
gtk_text_iter_get_pixmap (const GtkTextIter *iter, gtk_text_iter_get_pixbuf (const GtkTextIter *iter)
GdkPixmap** pixmap,
GdkBitmap** mask)
{ {
GtkTextRealIter *real; GtkTextRealIter *real;
g_return_val_if_fail(iter != NULL, FALSE); g_return_val_if_fail(iter != NULL, FALSE);
g_return_val_if_fail(pixmap != NULL, FALSE);
g_return_val_if_fail(mask != NULL, FALSE);