Mercurial > hg > xemacs-beta

comparison src/glyphs-widget.c @ 866:613552a02607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-04 17:39:43 by andyp] fix 21.4 merge problems
author andyp
date Tue, 04 Jun 2002 17:40:00 +0000
parents 42375619fa45
children 79c6ff3eef26
comparison
equal deleted inserted replaced
865:987c2a685f39 866:613552a02607
293 293
294 static int 294 static int
295 widget_logical_unit_height (Lisp_Image_Instance* ii) 295 widget_logical_unit_height (Lisp_Image_Instance* ii)
296 { 296 {
297 return logical_unit_height (NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)) ? 297 return logical_unit_height (NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)) ?
298 IMAGE_INSTANCE_NAME (ii) 298 NILP (IMAGE_INSTANCE_NAME (ii)) ?
299 Fsymbol_name (Qwidget)
300 : IMAGE_INSTANCE_NAME (ii)
299 : IMAGE_INSTANCE_WIDGET_TEXT (ii), 301 : IMAGE_INSTANCE_WIDGET_TEXT (ii),
300 IMAGE_INSTANCE_WIDGET_FACE (ii), 302 IMAGE_INSTANCE_WIDGET_FACE (ii),
301 IMAGE_INSTANCE_DOMAIN (ii)); 303 IMAGE_INSTANCE_DOMAIN (ii));
302 } 304 }
303 305