summaryrefslogtreecommitdiff
path: root/gtk/gtkclist.c
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2001-10-22 17:01:11 +0000
committerJacob Berkman <jberkman@src.gnome.org>2001-10-22 17:01:11 +0000
commiteb037279db30fc5fc6fddc7af7e0427384209b02 (patch)
tree05fe22a40f33f48ab9a22c2efe309f68837555a3 /gtk/gtkclist.c
parent0c6a8f530b51ae814229e1a3314a621b917e21ac (diff)
downloadgtk+-eb037279db30fc5fc6fddc7af7e0427384209b02.tar.gz
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)
Diffstat (limited to 'gtk/gtkclist.c')
-rw-r--r--gtk/gtkclist.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 4d35839036..0e1c467e0e 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -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);