comparison src/event-msw.c @ 233:52952cbfc5b5 r20-5b15

Import from CVS: tag r20-5b15
author cvs
date Mon, 13 Aug 2007 10:14:14 +0200
parents 557eaa0339bf
children 41f2f0e326e9
comparison
equal deleted inserted replaced
232:aa6545ea0638 233:52952cbfc5b5
389 mswindows_wm_timer_callback (HWND hwnd, UINT umsg, UINT id_timer, DWORD dwtime) 389 mswindows_wm_timer_callback (HWND hwnd, UINT umsg, UINT id_timer, DWORD dwtime)
390 { 390 {
391 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); 391 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
392 struct Lisp_Event *event = XEVENT (emacs_event); 392 struct Lisp_Event *event = XEVENT (emacs_event);
393 393
394 KillTimer (NULL, id_timer); 394 if (KillTimer (NULL, id_timer))
395 --mswindows_pending_timers_count; 395 --mswindows_pending_timers_count;
396 396
397 event->channel = Qnil; 397 event->channel = Qnil;
398 event->timestamp = dwtime; 398 event->timestamp = dwtime;
399 event->event_type = timeout_event; 399 event->event_type = timeout_event;
400 event->event.timeout.interval_id = id_timer; 400 event->event.timeout.interval_id = id_timer;
558 emacs_mswindows_remove_timeout (int id) 558 emacs_mswindows_remove_timeout (int id)
559 { 559 {
560 struct Lisp_Event match_against; 560 struct Lisp_Event match_against;
561 Lisp_Object emacs_event; 561 Lisp_Object emacs_event;
562 562
563 KillTimer (NULL, id); 563 if (KillTimer (NULL, id))
564 --mswindows_pending_timers_count; 564 --mswindows_pending_timers_count;
565 565
566 /* If there is a dispatch event generated by this 566 /* If there is a dispatch event generated by this
567 timeout in the queue, we have to remove it too. */ 567 timeout in the queue, we have to remove it too. */
568 match_against.event_type = timeout_event; 568 match_against.event_type = timeout_event;
569 match_against.event.timeout.interval_id = id; 569 match_against.event.timeout.interval_id = id;