comparison src/toolbar.c @ 245:51092a27c943 r20-5b21

Import from CVS: tag r20-5b21
author cvs
date Mon, 13 Aug 2007 10:17:54 +0200
parents 1f0dabaa0855
children 83b3d10dcba9
comparison
equal deleted inserted replaced
244:78d4f1140794 245:51092a27c943
444 tb->dirty = 1; 444 tb->dirty = 1;
445 } 445 }
446 446
447 /* We know that we at least have an up_glyph. Well, no, we 447 /* We know that we at least have an up_glyph. Well, no, we
448 don't. The user may have changed the button glyph on us. */ 448 don't. The user may have changed the button glyph on us. */
449 if (!NILP (glyphs) && CONSP (glyphs)) 449 if (CONSP (glyphs))
450 { 450 {
451 if (!EQ (XCAR (glyphs), tb->up_glyph)) 451 if (!EQ (XCAR (glyphs), tb->up_glyph))
452 { 452 {
453 tb->up_glyph = XCAR (glyphs); 453 tb->up_glyph = XCAR (glyphs);
454 tb->dirty = 1; 454 tb->dirty = 1;
457 } 457 }
458 else 458 else
459 tb->up_glyph = Qnil; 459 tb->up_glyph = Qnil;
460 460
461 /* We might have a down_glyph. */ 461 /* We might have a down_glyph. */
462 if (!NILP (glyphs) && CONSP (glyphs)) 462 if (CONSP (glyphs))
463 { 463 {
464 if (!EQ (XCAR (glyphs), tb->down_glyph)) 464 if (!EQ (XCAR (glyphs), tb->down_glyph))
465 { 465 {
466 tb->down_glyph = XCAR (glyphs); 466 tb->down_glyph = XCAR (glyphs);
467 tb->dirty = 1; 467 tb->dirty = 1;
470 } 470 }
471 else 471 else
472 tb->down_glyph = Qnil; 472 tb->down_glyph = Qnil;
473 473
474 /* We might have a disabled_glyph. */ 474 /* We might have a disabled_glyph. */
475 if (!NILP (glyphs) && CONSP (glyphs)) 475 if (CONSP (glyphs))
476 { 476 {
477 if (!EQ (XCAR (glyphs), tb->disabled_glyph)) 477 if (!EQ (XCAR (glyphs), tb->disabled_glyph))
478 { 478 {
479 tb->disabled_glyph = XCAR (glyphs); 479 tb->disabled_glyph = XCAR (glyphs);
480 tb->dirty = 1; 480 tb->dirty = 1;
483 } 483 }
484 else 484 else
485 tb->disabled_glyph = Qnil; 485 tb->disabled_glyph = Qnil;
486 486
487 /* We might have a cap_up_glyph. */ 487 /* We might have a cap_up_glyph. */
488 if (!NILP (glyphs) && CONSP (glyphs)) 488 if (CONSP (glyphs))
489 { 489 {
490 if (!EQ (XCAR (glyphs), tb->cap_up_glyph)) 490 if (!EQ (XCAR (glyphs), tb->cap_up_glyph))
491 { 491 {
492 tb->cap_up_glyph = XCAR (glyphs); 492 tb->cap_up_glyph = XCAR (glyphs);
493 tb->dirty = 1; 493 tb->dirty = 1;
496 } 496 }
497 else 497 else
498 tb->cap_up_glyph = Qnil; 498 tb->cap_up_glyph = Qnil;
499 499
500 /* We might have a cap_down_glyph. */ 500 /* We might have a cap_down_glyph. */
501 if (!NILP (glyphs) && CONSP (glyphs)) 501 if (CONSP (glyphs))
502 { 502 {
503 if (!EQ (XCAR (glyphs), tb->cap_down_glyph)) 503 if (!EQ (XCAR (glyphs), tb->cap_down_glyph))
504 { 504 {
505 tb->cap_down_glyph = XCAR (glyphs); 505 tb->cap_down_glyph = XCAR (glyphs);
506 tb->dirty = 1; 506 tb->dirty = 1;
509 } 509 }
510 else 510 else
511 tb->cap_down_glyph = Qnil; 511 tb->cap_down_glyph = Qnil;
512 512
513 /* We might have a cap_disabled_glyph. */ 513 /* We might have a cap_disabled_glyph. */
514 if (!NILP (glyphs) && CONSP (glyphs)) 514 if (CONSP (glyphs))
515 { 515 {
516 if (!EQ (XCAR (glyphs), tb->cap_disabled_glyph)) 516 if (!EQ (XCAR (glyphs), tb->cap_disabled_glyph))
517 { 517 {
518 tb->cap_disabled_glyph = XCAR (glyphs); 518 tb->cap_disabled_glyph = XCAR (glyphs);
519 tb->dirty = 1; 519 tb->dirty = 1;