Mercurial > hg > xemacs-beta

comparison src/frame.h @ 263:727739f917cb r20-5b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b30
author cvs
date Mon, 13 Aug 2007 10:24:41 +0200
parents 85a06df23a9a
children 966663fcf606
comparison
equal deleted inserted replaced
262:9d8607af9e13 263:727739f917cb
401 below for that. 401 below for that.
402 */ 402 */
403 403
404 #ifdef HAVE_TOOLBARS 404 #ifdef HAVE_TOOLBARS
405 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) \ 405 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) \
406 (!NILP ((f)->toolbar_visible_p[pos])) 406 (!NILP((f)->toolbar_data[pos]) && !NILP ((f)->toolbar_visible_p[pos]))
407 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) \ 407 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) \
408 (XINT ((f)->toolbar_size[pos])) 408 (!NILP ((f)->toolbar_data[pos]) ? \
409 (XINT ((f)->toolbar_size[pos])) : 0)
409 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \ 410 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) \
410 (XINT ((f)->toolbar_border_width[pos])) 411 (!NILP ((f)->toolbar_data[pos]) ? \
412 (XINT ((f)->toolbar_border_width[pos])) : 0)
411 #else 413 #else
412 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) 0 414 #define FRAME_RAW_THEORETICAL_TOOLBAR_VISIBLE(f, pos) 0
413 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) 0 415 #define FRAME_RAW_THEORETICAL_TOOLBAR_SIZE(f, pos) 0
414 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) 0 416 #define FRAME_RAW_THEORETICAL_TOOLBAR_BORDER_WIDTH(f, pos) 0
415 #endif 417 #endif
479 that use these macros and expect the former semantics, so 481 that use these macros and expect the former semantics, so
480 if you encounter some odd toolbar behavior, you might want 482 if you encounter some odd toolbar behavior, you might want
481 to look into this. --ben */ 483 to look into this. --ben */
482 484
483 #define FRAME_REAL_TOOLBAR_VISIBLE(f, pos) \ 485 #define FRAME_REAL_TOOLBAR_VISIBLE(f, pos) \
484 (FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) > 0 \ 486 ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
485 && !NILP (FRAME_REAL_TOOLBAR (f, pos)) \ 487 && FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) > 0) \
486 ? FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \ 488 ? FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \
487 : 0) 489 : 0)
488 #define FRAME_REAL_TOOLBAR_SIZE(f, pos) \ 490 #define FRAME_REAL_TOOLBAR_SIZE(f, pos) \
489 (FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \ 491 ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
490 && !NILP (FRAME_REAL_TOOLBAR (f, pos)) \ 492 && FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos)) \
491 ? FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) \ 493 ? FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) \
492 : 0) 494 : 0)
493 #define FRAME_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \ 495 #define FRAME_REAL_TOOLBAR_BORDER_WIDTH(f, pos) \
494 (FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \ 496 ((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
495 && !NILP (FRAME_REAL_TOOLBAR (f, pos)) \ 497 && FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos)) \
496 ? FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH (f, pos) \ 498 ? FRAME_RAW_REAL_TOOLBAR_BORDER_WIDTH (f, pos) \
497 : 0) 499 : 0)
498 500
499 #define FRAME_REAL_TOP_TOOLBAR_HEIGHT(f) \ 501 #define FRAME_REAL_TOP_TOOLBAR_HEIGHT(f) \
500 FRAME_REAL_TOOLBAR_SIZE (f, TOP_TOOLBAR) 502 FRAME_REAL_TOOLBAR_SIZE (f, TOP_TOOLBAR)