Mercurial > hg > xemacs-beta
comparison src/scrollbar.c @ 276:6330739388db r21-0b36
Import from CVS: tag r21-0b36
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:30:37 +0200 |
parents | c5d627a313b1 |
children | 7df0dd720c89 |
comparison
equal
deleted
inserted
replaced
275:a68ae4439f57 | 276:6330739388db |
---|---|
539 { | 539 { |
540 struct device *d = XDEVICE (f->device); | 540 struct device *d = XDEVICE (f->device); |
541 | 541 |
542 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) | 542 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) |
543 { | 543 { |
544 int depth = reveal_ghost_specifiers_protected (); | |
544 Lisp_Object frame; | 545 Lisp_Object frame; |
545 XSETFRAME (frame, f); | 546 XSETFRAME (frame, f); |
546 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (f)), | 547 call_critical_lisp_code (XDEVICE (FRAME_DEVICE (f)), |
547 Qinit_scrollbar_from_resources, | 548 Qinit_scrollbar_from_resources, |
548 frame); | 549 frame); |
550 unbind_to (depth, Qnil); | |
549 } | 551 } |
550 } | 552 } |
551 | 553 |
552 void | 554 void |
553 init_device_scrollbars (struct device *d) | 555 init_device_scrollbars (struct device *d) |
554 { | 556 { |
555 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) | 557 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) |
556 { | 558 { |
559 int depth = reveal_ghost_specifiers_protected (); | |
557 Lisp_Object device; | 560 Lisp_Object device; |
558 XSETDEVICE (device, d); | 561 XSETDEVICE (device, d); |
559 call_critical_lisp_code (d, | 562 call_critical_lisp_code (d, |
560 Qinit_scrollbar_from_resources, | 563 Qinit_scrollbar_from_resources, |
561 device); | 564 device); |
565 unbind_to (depth, Qnil); | |
562 } | 566 } |
563 } | 567 } |
564 | 568 |
565 void | 569 void |
566 init_global_scrollbars (struct device *d) | 570 init_global_scrollbars (struct device *d) |
567 { | 571 { |
568 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) | 572 if (HAS_DEVMETH_P (d, create_scrollbar_instance)) |
569 { | 573 { |
574 int depth = reveal_ghost_specifiers_protected (); | |
570 call_critical_lisp_code (d, | 575 call_critical_lisp_code (d, |
571 Qinit_scrollbar_from_resources, | 576 Qinit_scrollbar_from_resources, |
572 Qglobal); | 577 Qglobal); |
578 unbind_to (depth, Qnil); | |
573 } | 579 } |
574 } | 580 } |
575 | 581 |
576 | 582 |
577 /* This function is called as a result of a change to the | 583 /* This function is called as a result of a change to the |
926 { | 932 { |
927 DEFVAR_SPECIFIER ("scrollbar-width", &Vscrollbar_width /* | 933 DEFVAR_SPECIFIER ("scrollbar-width", &Vscrollbar_width /* |
928 *Width of vertical scrollbars. | 934 *Width of vertical scrollbars. |
929 This is a specifier; use `set-specifier' to change it. | 935 This is a specifier; use `set-specifier' to change it. |
930 */ ); | 936 */ ); |
931 Vscrollbar_width = Fmake_specifier (Qnatnum); | 937 Vscrollbar_width = make_magic_specifier (Qnatnum); |
932 set_specifier_fallback | 938 set_specifier_fallback |
933 (Vscrollbar_width, | 939 (Vscrollbar_width, |
934 list1 (Fcons (Qnil, make_int (DEFAULT_SCROLLBAR_WIDTH)))); | 940 list1 (Fcons (Qnil, make_int (DEFAULT_SCROLLBAR_WIDTH)))); |
935 set_specifier_caching (Vscrollbar_width, | 941 set_specifier_caching (Vscrollbar_width, |
936 slot_offset (struct window, | 942 slot_offset (struct window, |
942 | 948 |
943 DEFVAR_SPECIFIER ("scrollbar-height", &Vscrollbar_height /* | 949 DEFVAR_SPECIFIER ("scrollbar-height", &Vscrollbar_height /* |
944 *Height of horizontal scrollbars. | 950 *Height of horizontal scrollbars. |
945 This is a specifier; use `set-specifier' to change it. | 951 This is a specifier; use `set-specifier' to change it. |
946 */ ); | 952 */ ); |
947 Vscrollbar_height = Fmake_specifier (Qnatnum); | 953 Vscrollbar_height = make_magic_specifier (Qnatnum); |
948 set_specifier_fallback | 954 set_specifier_fallback |
949 (Vscrollbar_height, | 955 (Vscrollbar_height, |
950 list1 (Fcons (Qnil, make_int (DEFAULT_SCROLLBAR_HEIGHT)))); | 956 list1 (Fcons (Qnil, make_int (DEFAULT_SCROLLBAR_HEIGHT)))); |
951 set_specifier_caching (Vscrollbar_height, | 957 set_specifier_caching (Vscrollbar_height, |
952 slot_offset (struct window, | 958 slot_offset (struct window, |