Mercurial > hg > xemacs-beta
comparison src/event-msw.c @ 707:a307f9a2021d
[xemacs-hg @ 2001-12-20 05:49:28 by andyp]
sync with 21-4-6-windows
author | andyp |
---|---|
date | Thu, 20 Dec 2001 05:49:48 +0000 |
parents | 685b588e92d8 |
children | 46d76bae9921 |
comparison
equal
deleted
inserted
replaced
706:c9bf82d465b5 | 707:a307f9a2021d |
---|---|
2628 FRAME_VISIBLE_P (frame) = 0; | 2628 FRAME_VISIBLE_P (frame) = 0; |
2629 FRAME_ICONIFIED_P (frame) = 1; | 2629 FRAME_ICONIFIED_P (frame) = 1; |
2630 } | 2630 } |
2631 else if (IsWindowVisible (hwnd)) | 2631 else if (IsWindowVisible (hwnd)) |
2632 { | 2632 { |
2633 /* | 2633 /* APA: It's too early here to set the frame visible. |
2634 APA: It's too early here to set the frame visible. | 2634 * Let's do this later, in WM_SIZE processing, after the |
2635 Let's do this later, in WM_SIZE processing, after the | 2635 * magic XM_MAPFRAME event has been sent (just like 21.1 |
2636 magic XM_MAPFRAME event has been sent (just like 21.1 | 2636 * did). */ |
2637 did). | 2637 /* FRAME_VISIBLE_P (frame) = 1; */ |
2638 */ | |
2639 /* FRAME_VISIBLE_P (frame) = 1; */ | |
2640 FRAME_ICONIFIED_P (frame) = 0; | 2638 FRAME_ICONIFIED_P (frame) = 0; |
2641 } | 2639 } |
2642 else | 2640 else |
2643 { | 2641 { |
2644 FRAME_VISIBLE_P (frame) = 0; | 2642 FRAME_VISIBLE_P (frame) = 0; |
2699 } | 2697 } |
2700 else | 2698 else |
2701 { | 2699 { |
2702 if (!msframe->sizing && !FRAME_VISIBLE_P (frame)) | 2700 if (!msframe->sizing && !FRAME_VISIBLE_P (frame)) |
2703 mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME); | 2701 mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME); |
2704 /* | 2702 /* APA: Now that the magic XM_MAPFRAME event has |
2705 APA: Now that the magic XM_MAPFRAME event has | 2703 * been sent we can mark the frame as visible (just |
2706 been sent we can mark the frame as visible (just | 2704 * like 21.1 did). */ |
2707 like 21.1 did). | 2705 FRAME_VISIBLE_P (frame) = 1; |
2708 */ | |
2709 FRAME_VISIBLE_P (frame) = 1; | |
2710 | 2706 |
2711 if (!msframe->sizing || mswindows_dynamic_frame_resize) | 2707 if (!msframe->sizing || mswindows_dynamic_frame_resize) |
2712 redisplay (); | 2708 redisplay (); |
2713 } | 2709 } |
2714 } | 2710 } |
2827 | 2823 |
2828 case WM_MOUSEWHEEL: | 2824 case WM_MOUSEWHEEL: |
2829 { | 2825 { |
2830 int keys = LOWORD (wParam); /* Modifier key flags */ | 2826 int keys = LOWORD (wParam); /* Modifier key flags */ |
2831 int delta = (short) HIWORD (wParam); /* Wheel rotation amount */ | 2827 int delta = (short) HIWORD (wParam); /* Wheel rotation amount */ |
2832 struct gcpro gcpro1, gcpro2; | |
2833 | 2828 |
2834 if (mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd), | 2829 if (mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd), |
2835 keys, delta, | 2830 keys, delta, |
2836 MAKEPOINTS (lParam))) | 2831 MAKEPOINTS (lParam))) |
2837 { | 2832 /* We are not in a modal loop so no pumping is necessary. */ |
2838 GCPRO2 (emacs_event, fobj); | 2833 break; |
2839 if (UNBOUNDP(mswindows_pump_outstanding_events ())) /* Can GC */ | |
2840 SendMessage (hwnd, WM_CANCELMODE, 0, 0); | |
2841 UNGCPRO; | |
2842 } | |
2843 else | 2834 else |
2844 goto defproc; | 2835 goto defproc; |
2845 break; | |
2846 } | 2836 } |
2847 #endif | 2837 #endif |
2848 | 2838 |
2849 #ifdef HAVE_MENUBARS | 2839 #ifdef HAVE_MENUBARS |
2850 case WM_INITMENU: | 2840 case WM_INITMENU: |