Commit eb037279 authored by jacob berkman's avatar jacob berkman Committed by Jacob Berkman

don't cast a PIXTEXT cell to a PIXMAP cell (fixes crash when using PIXTEXT

2001-10-22  jacob berkman  <jacob@ximian.com>

	* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
	a PIXMAP cell (fixes crash when using PIXTEXT cells)
parent 0c6a8f53
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
2001-10-22 jacob berkman <jacob@ximian.com>
* gtk/gtkclist.c (cell_size_request): don't cast a PIXTEXT cell to
a PIXMAP cell (fixes crash when using PIXTEXT cells)
Sat Oct 20 18:58:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.h: Deprecate gtk_entry_set_editable.
......
......@@ -2618,6 +2618,11 @@ cell_size_request (GtkCList *clist,
switch (clist_row->cell[column].type)
{
case GTK_CELL_PIXTEXT:
gdk_window_get_size (GTK_CELL_PIXTEXT (clist_row->cell[column])->pixmap,
&width, &height);
requisition->width += width;
requisition->height = MAX (requisition->height, height);
break;
case GTK_CELL_PIXMAP:
gdk_window_get_size (GTK_CELL_PIXMAP (clist_row->cell[column])->pixmap,
&width, &height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment