Mercurial > hg > xemacs-beta

comparison src/glyphs-widget.c @ 3466:4d52aea479a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
3465:af932b7bc2ee 3466:4d52aea479a2
567 size the same as the text dimensions. */ 567 size the same as the text dimensions. */
568 widget_query_string_geometry (IMAGE_INSTANCE_WIDGET_TEXT (ii), 568 widget_query_string_geometry (IMAGE_INSTANCE_WIDGET_TEXT (ii),
569 IMAGE_INSTANCE_WIDGET_FACE (ii), 569 IMAGE_INSTANCE_WIDGET_FACE (ii),
570 &w, &h, domain); 570 &w, &h, domain);
571 /* Adjust the size for borders. */ 571 /* Adjust the size for borders. */
572 if (IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii)) 572 if (width && IMAGE_INSTANCE_SUBWINDOW_H_RESIZEP (ii))
573 *width = w + 2 * widget_instance_border_width (ii); 573 *width = w + 2 * widget_instance_border_width (ii);
574 if (IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii)) 574 if (height && IMAGE_INSTANCE_SUBWINDOW_V_RESIZEP (ii))
575 *height = h + 2 * widget_instance_border_width (ii); 575 *height = h + 2 * widget_instance_border_width (ii);
576 } 576 }
577 } 577 }
578 /* Finish off with dynamic sizing. */ 578 /* Finish off with dynamic sizing. */
579 if (!NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii))) 579 if (width && !NILP (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)))
580 { 580 {
581 dynamic_width = 581 dynamic_width =
582 eval_within_redisplay (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii)); 582 eval_within_redisplay (IMAGE_INSTANCE_WIDGET_WIDTH_SUBR (ii));
583 if (INTP (dynamic_width)) 583 if (INTP (dynamic_width))
584 *width = XINT (dynamic_width); 584 *width = XINT (dynamic_width);
585 } 585 }
586 if (!NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii))) 586 if (height && !NILP (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)))
587 { 587 {
588 dynamic_height = 588 dynamic_height =
589 eval_within_redisplay (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii)); 589 eval_within_redisplay (IMAGE_INSTANCE_WIDGET_HEIGHT_SUBR (ii));
590 if (INTP (dynamic_height)) 590 if (INTP (dynamic_height))
591 *height = XINT (dynamic_height); 591 *height = XINT (dynamic_height);