Mercurial > hg > xemacs-beta
diff src/glyphs-widget.c @ 3466:4d52aea479a2
[xemacs-hg @ 2006-06-21 17:30:33 by james]
Fix various problems found by static checkers. Also, but back the CURCHARSIZE
macro in window.c to preserve the abstraction.
<m3mzc6wh85.fsf_-_@jerrypc.cs.usu.edu>
| author | james |
|---|---|
| date | Wed, 21 Jun 2006 17:30:37 +0000 |
| parents | ad2f4ae9895b |
| children | 8f1ee2d15784 |
line wrap: on
line diff
--- a/src/glyphs-widget.c Tue Jun 20 21:51:21 2006 +0000 +++ b/src/glyphs-widget.c Wed Jun 21 17:30:37 2006 +0000 @@ -569,21 +569,21 @@ IMAGE_INSTANCE_WIDGET_FACE (ii), &w, &h, domain); /* Adjust the size for borders. */ - if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) + if (width && IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) *width = w + 2 * widget_instance_border_width (ii); - if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) + if (height && IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) *height = h + 2 * widget_instance_border_width (ii); } } /* Finish off with dynamic sizing. */ - if (!NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii))) + if (width && !NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii))) { dynamic_width = eval_within_redisplay (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)); if (INTP (dynamic_width)) *width = XINT (dynamic_width); } - if (!NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii))) + if (height && !NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii))) { dynamic_height = eval_within_redisplay (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii));