comparison src/gui-msw.c @ 964:8d610ea37af8

[xemacs-hg @ 2002-08-16 08:15:18 by michaels] 2002-08-13 David Bush <David.Bush@intel.com> * device-msw.c: Correct initialization list for devmode_description Add dumpable flag to msprinter-settings for USE_KKCC * dialog-msw.c: Add dumpable flag to mswindows-dialog-id for USE_KKCC * event-msw.c (mswindows_enqueue_misc_user_event): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_enqueue_magic_event): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_enqueue_process_event): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_enqueue_mouse_button_event): Reorder event setup so event type is set first to support USE_KKCC. For USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_enqueue_keypress_event): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_dequeue_dispatch_event): With USE_KKCC use accessor to get and mutator macros to set event parameters * event-msw.c (mswindows_cancel_dispatch_event): With USE_KKCC use accessor macros to get event parameters * event-msw.c (mswindows_wm_timer_callback): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_dde_callback): With USE_KKCC use mutator macros to set event parameters * event-msw.c (mswindows_wnd_proc): With USE_KKCC use mutator macros to set event parameters * event-msw.c (emacs_mswindows_remove_timeout): With USE_KKCC use mutator macros to set event parameters * event-msw.c (emacs_mswindows_format_magic_event): With USE_KKCC use accessor macro to access magic event type * event-msw.c (emacs_mswindows_compare_magic_event): With USE_KKCC use accessor macro to access magic event type * event-msw.c (emacs_mswindows_hash_magic_event): With USE_KKCC use accessor macro to access magic event type * event-msw.c (emacs_mswindows_handle_magic_event): With USE_KKCC use accessor macro to access magic event type and event data * event-msw.c (emacs_mswindows_quit_p): With USE_KKCC use event accessor and mutator macros to get/set event parameters * gui-msw.c (mswindows_handle_gui_wm_command): For USE_KKCC use mutator macros to set event parameters. Make the event data type match the event type. * menubar-msw.c (mswindows_popup_menu): With USE_KKCC use accessor macros to extract button position
author michaels
date Fri, 16 Aug 2002 08:15:42 +0000
parents 79c6ff3eef26
children e22b0213b713
comparison
equal deleted inserted replaced
963:6b31140c1456 964:8d610ea37af8
62 62
63 if (!NILP (callback_ex) && !UNBOUNDP (callback_ex)) 63 if (!NILP (callback_ex) && !UNBOUNDP (callback_ex))
64 { 64 {
65 event = Fmake_event (Qnil, Qnil); 65 event = Fmake_event (Qnil, Qnil);
66 66
67 #ifdef USE_KKCC
68 XSET_EVENT_TYPE (event, misc_user_event);
69 XSET_EVENT_CHANNEL (event, frame);
70 XSET_EVENT_TIMESTAMP (event, GetTickCount());
71 XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), Qeval);
72 XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event),
73 list4 (Qfuncall, callback_ex, image_instance, event));
74 #else /* not USE_KKCC */
67 XEVENT (event)->event_type = misc_user_event; 75 XEVENT (event)->event_type = misc_user_event;
68 XEVENT (event)->channel = frame; 76 XEVENT (event)->channel = frame;
69 XEVENT (event)->timestamp = GetTickCount (); 77 XEVENT (event)->timestamp = GetTickCount ();
70 XEVENT (event)->event.eval.function = Qeval; 78 XEVENT (event)->event.eval.function = Qeval;
71 XEVENT (event)->event.eval.object = 79 XEVENT (event)->event.eval.object =
72 list4 (Qfuncall, callback_ex, image_instance, event); 80 list4 (Qfuncall, callback_ex, image_instance, event);
81 #endif /* not USE_KKCC */
73 } 82 }
74 else if (NILP (callback) || UNBOUNDP (callback)) 83 else if (NILP (callback) || UNBOUNDP (callback))
75 return Qnil; 84 return Qnil;
76 else 85 else
77 { 86 {
78 Lisp_Object fn, arg; 87 Lisp_Object fn, arg;
79 88
80 event = Fmake_event (Qnil, Qnil); 89 event = Fmake_event (Qnil, Qnil);
81 90
82 get_gui_callback (callback, &fn, &arg); 91 get_gui_callback (callback, &fn, &arg);
92 #ifdef USE_KKCC
93 XSET_EVENT_TYPE (event, misc_user_event);
94 XSET_EVENT_CHANNEL (event, frame);
95 XSET_EVENT_TIMESTAMP (event, GetTickCount());
96 XSET_MISC_USER_DATA_FUNCTION (XEVENT_DATA (event), fn);
97 XSET_MISC_USER_DATA_OBJECT (XEVENT_DATA (event), arg);
98 #else /* not USE_KKCC */
83 XEVENT (event)->event_type = misc_user_event; 99 XEVENT (event)->event_type = misc_user_event;
84 XEVENT (event)->channel = frame; 100 XEVENT (event)->channel = frame;
85 XEVENT (event)->timestamp = GetTickCount (); 101 XEVENT (event)->timestamp = GetTickCount ();
86 XEVENT (event)->event.eval.function = fn; 102 XEVENT (event)->event.eval.function = fn;
87 XEVENT (event)->event.eval.object = arg; 103 XEVENT (event)->event.eval.object = arg;
104 #endif /* not USE_KKCC */
88 } 105 }
89 106
90 mswindows_enqueue_dispatch_event (event); 107 mswindows_enqueue_dispatch_event (event);
91 /* The result of this evaluation could cause other instances to change so 108 /* The result of this evaluation could cause other instances to change so
92 enqueue an update callback to check this. */ 109 enqueue an update callback to check this. */