Mercurial > hg > xemacs-beta

comparison src/toolbar-x.c @ 286:57709be46d1b r21-0b41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents c42ec1d1cded
children 8626e4521993
comparison
equal deleted inserted replaced
285:9a3756523c1b 286:57709be46d1b
436 { 436 {
437 max_pixpos = x + bar_width - border_width; 437 max_pixpos = x + bar_width - border_width;
438 x += border_width; 438 x += border_width;
439 } 439 }
440 440
441 button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons; 441 button = FRAME_TOOLBAR_BUTTONS (f, pos);
442 right_size = 0; 442 right_size = 0;
443 443
444 /* First loop over all of the buttons to determine how much room we 444 /* First loop over all of the buttons to determine how much room we
445 need for left hand and right hand buttons. This loop will also 445 need for left hand and right hand buttons. This loop will also
446 make sure that all instances are instantiated so when we actually 446 make sure that all instances are instantiated so when we actually
454 right_size += size; 454 right_size += size;
455 455
456 button = tb->next; 456 button = tb->next;
457 } 457 }
458 458
459 button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons; 459 button = FRAME_TOOLBAR_BUTTONS (f, pos);
460 460
461 /* Loop over the left buttons, updating and outputting them. */ 461 /* Loop over the left buttons, updating and outputting them. */
462 X_OUTPUT_BUTTONS_LOOP (1); 462 X_OUTPUT_BUTTONS_LOOP (1);
463 463
464 /* Now determine where the right buttons start. */ 464 /* Now determine where the right buttons start. */
577 static void 577 static void
578 x_redraw_exposed_toolbar (struct frame *f, enum toolbar_pos pos, int x, int y, 578 x_redraw_exposed_toolbar (struct frame *f, enum toolbar_pos pos, int x, int y,
579 int width, int height) 579 int width, int height)
580 { 580 {
581 int bar_x, bar_y, bar_width, bar_height, vert; 581 int bar_x, bar_y, bar_width, bar_height, vert;
582 Lisp_Object button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons; 582 Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, pos);
583 583
584 get_toolbar_coords (f, pos, &bar_x, &bar_y, &bar_width, &bar_height, 584 get_toolbar_coords (f, pos, &bar_x, &bar_y, &bar_width, &bar_height,
585 &vert, 1); 585 &vert, 1);
586 586
587 if (((y + height) < bar_y) || (y > (bar_y + bar_height))) 587 if (((y + height) < bar_y) || (y > (bar_y + bar_height)))