comparison src/toolbar-x.c @ 438:84b14dcb0985 r21-2-27

Import from CVS: tag r21-2-27
author cvs
date Mon, 13 Aug 2007 11:32:25 +0200
parents 3ecd8885ac67
children 8de8e3f6228a
comparison
equal deleted inserted replaced
437:e2a4e8b94b82 438:84b14dcb0985
294 in that case. */ 294 in that case. */
295 if (NILP (glyph)) 295 if (NILP (glyph))
296 return XINT (f->toolbar_size[pos]); 296 return XINT (f->toolbar_size[pos]);
297 297
298 if (vert) 298 if (vert)
299 size = glyph_height (glyph, Vdefault_face, 0, window); 299 size = glyph_height (glyph, window);
300 else 300 else
301 size = glyph_width (glyph, Vdefault_face, 0, window); 301 size = glyph_width (glyph, window);
302 } 302 }
303 303
304 if (!size) 304 if (!size)
305 { 305 {
306 /* If the glyph doesn't have a size we'll insert a blank 306 /* If the glyph doesn't have a size we'll insert a blank