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

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents c42ec1d1cded
children 8626e4521993
line wrap: on
line diff
--- a/src/toolbar-x.c	Mon Aug 13 10:34:15 2007 +0200
+++ b/src/toolbar-x.c	Mon Aug 13 10:35:03 2007 +0200
@@ -438,7 +438,7 @@
       x += border_width;
     }
 
-  button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons;
+  button = FRAME_TOOLBAR_BUTTONS (f, pos);
   right_size = 0;
 
   /* First loop over all of the buttons to determine how much room we
@@ -456,7 +456,7 @@
       button = tb->next;
     }
 
-  button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons;
+  button = FRAME_TOOLBAR_BUTTONS (f, pos);
 
   /* Loop over the left buttons, updating and outputting them. */
   X_OUTPUT_BUTTONS_LOOP (1);
@@ -579,7 +579,7 @@
 			  int width, int height)
 {
   int bar_x, bar_y, bar_width, bar_height, vert;
-  Lisp_Object button = FRAME_TOOLBAR_DATA (f, pos)->toolbar_buttons;
+  Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, pos);
 
   get_toolbar_coords (f, pos, &bar_x, &bar_y, &bar_width, &bar_height,
 		      &vert, 1);