Mercurial > hg > xemacs-beta
comparison src/event-msw.c @ 4982:3c3c1d139863
Automatic merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:25:00 -0600 |
parents | 4aebb0131297 16112448d484 |
children | ae48681c47fa |
comparison
equal
deleted
inserted
replaced
4981:4aebb0131297 | 4982:3c3c1d139863 |
---|---|
830 if (str->pending_p) | 830 if (str->pending_p) |
831 WaitForSingleObject (str->ov.hEvent, INFINITE); | 831 WaitForSingleObject (str->ov.hEvent, INFINITE); |
832 | 832 |
833 if (str->buffer) | 833 if (str->buffer) |
834 { | 834 { |
835 xfree (str->buffer, void *); | 835 xfree (str->buffer); |
836 str->buffer = 0; | 836 str->buffer = 0; |
837 } | 837 } |
838 | 838 |
839 CloseHandle (str->ov.hEvent); | 839 CloseHandle (str->ov.hEvent); |
840 return 0; | 840 return 0; |
2111 file:///C:/foo/bar/ (less portably) | 2111 file:///C:/foo/bar/ (less portably) |
2112 | 2112 |
2113 they don't allow relative paths at all! this is way bogus. */ | 2113 they don't allow relative paths at all! this is way bogus. */ |
2114 cmd = urlify_filename (cmd); | 2114 cmd = urlify_filename (cmd); |
2115 l_dndlist = build_istring (cmd); | 2115 l_dndlist = build_istring (cmd); |
2116 xfree (cmd, Ibyte *); | 2116 xfree (cmd); |
2117 } | 2117 } |
2118 GCPRO2 (emacs_event, l_dndlist); | 2118 GCPRO2 (emacs_event, l_dndlist); |
2119 | 2119 |
2120 /* Find a mswindows frame */ | 2120 /* Find a mswindows frame */ |
2121 event->channel = Qnil; | 2121 event->channel = Qnil; |
2741 /* See intl-win32.c for an explanation of | 2741 /* See intl-win32.c for an explanation of |
2742 the following */ | 2742 the following */ |
2743 ((LCID) GetKeyboardLayout (0) & 0xFFFF), | 2743 ((LCID) GetKeyboardLayout (0) & 0xFFFF), |
2744 NULL)); | 2744 NULL)); |
2745 ch = itext_ichar (intchar); | 2745 ch = itext_ichar (intchar); |
2746 xfree (intchar, Ibyte *); | 2746 xfree (intchar); |
2747 } | 2747 } |
2748 | 2748 |
2749 #ifdef DEBUG_XEMACS | 2749 #ifdef DEBUG_XEMACS |
2750 if (debug_mswindows_events) | 2750 if (debug_mswindows_events) |
2751 { | 2751 { |
2885 mswindows_locale_to_code_page (lcid), | 2885 mswindows_locale_to_code_page (lcid), |
2886 NULL); | 2886 NULL); |
2887 | 2887 |
2888 XSET_EVENT_KEY_ALT_KEYCHARS | 2888 XSET_EVENT_KEY_ALT_KEYCHARS |
2889 (lastev, i, itext_ichar (intchar)); | 2889 (lastev, i, itext_ichar (intchar)); |
2890 xfree (intchar, Ibyte *); | 2890 xfree (intchar); |
2891 } | 2891 } |
2892 } | 2892 } |
2893 } | 2893 } |
2894 else | 2894 else |
2895 { | 2895 { |
3405 /* Reset so we do not get here again. The SetWindowPos | 3405 /* Reset so we do not get here again. The SetWindowPos |
3406 * call in mswindows_size_frame_internal can cause | 3406 * call in mswindows_size_frame_internal can cause |
3407 * recursion here. */ | 3407 * recursion here. */ |
3408 if (FRAME_MSWINDOWS_TARGET_RECT (frame)) | 3408 if (FRAME_MSWINDOWS_TARGET_RECT (frame)) |
3409 { | 3409 { |
3410 xfree (FRAME_MSWINDOWS_TARGET_RECT (frame), | 3410 xfree (FRAME_MSWINDOWS_TARGET_RECT (frame)); |
3411 XEMACS_RECT_WH *); | |
3412 FRAME_MSWINDOWS_TARGET_RECT (frame) = 0; | 3411 FRAME_MSWINDOWS_TARGET_RECT (frame) = 0; |
3413 } | 3412 } |
3414 } | 3413 } |
3415 else | 3414 else |
3416 { | 3415 { |
3726 } | 3725 } |
3727 | 3726 |
3728 { | 3727 { |
3729 Ibyte *fname2 = urlify_filename (fname); | 3728 Ibyte *fname2 = urlify_filename (fname); |
3730 l_item = build_istring (fname2); | 3729 l_item = build_istring (fname2); |
3731 xfree (fname2, Ibyte *); | 3730 xfree (fname2); |
3732 if (freeme) | 3731 if (freeme) |
3733 xfree (fname, Ibyte *); | 3732 xfree (fname); |
3734 l_dndlist = Fcons (l_item, l_dndlist); | 3733 l_dndlist = Fcons (l_item, l_dndlist); |
3735 } | 3734 } |
3736 } | 3735 } |
3737 | 3736 |
3738 DragFinish ((HDROP) wParam); | 3737 DragFinish ((HDROP) wParam); |