Mercurial > emacs
comparison src/macfns.c @ 57425:0867872551d9
macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow
(x_lower_frame): Add BLOCK_INPUT around SendBehind
(make_mac_frame): Add BLOCK_INPUT around the making of a
terminal frame
(mac_initialize): Add BLOCK_INPUT around carbon initialization
macgui.h (mktime): Use emacs_mktime
macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code.
Make a cancel file-open dialog be like C-g.
mac.c (mktime): Use emacs_mktime
(Fdo_applescript): Add BLOCK_INPUT around do_applescript
(Fmac_paste_function): Add better error handling for carbon
cut/paste
author | Steven Tamm <steventamm@mac.com> |
---|---|
date | Sun, 10 Oct 2004 16:56:21 +0000 |
parents | 05fe2d3ca439 |
children | c955f6add62a ff0e824afa37 |
comparison
equal
deleted
inserted
replaced
57424:b1ed4b950258 | 57425:0867872551d9 |
---|---|
4245 NavDialogRef dialogRef; | 4245 NavDialogRef dialogRef; |
4246 NavTypeListHandle fileTypes = NULL; | 4246 NavTypeListHandle fileTypes = NULL; |
4247 NavUserAction userAction; | 4247 NavUserAction userAction; |
4248 CFStringRef message=NULL, client=NULL, saveName = NULL; | 4248 CFStringRef message=NULL, client=NULL, saveName = NULL; |
4249 | 4249 |
4250 BLOCK_INPUT; | |
4250 /* No need for a callback function because we are modal */ | 4251 /* No need for a callback function because we are modal */ |
4251 NavGetDefaultDialogCreationOptions(&options); | 4252 NavGetDefaultDialogCreationOptions(&options); |
4252 options.modality = kWindowModalityAppModal; | 4253 options.modality = kWindowModalityAppModal; |
4253 options.location.h = options.location.v = -1; | 4254 options.location.h = options.location.v = -1; |
4254 options.optionFlags = kNavDefaultNavDlogOptions; | 4255 options.optionFlags = kNavDefaultNavDlogOptions; |
4315 NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed); | 4316 NavCustomControl(dialogRef, kNavCtlSetLocation, (void*) &defLocAed); |
4316 } | 4317 } |
4317 AEDisposeDesc(&defLocAed); | 4318 AEDisposeDesc(&defLocAed); |
4318 } | 4319 } |
4319 | 4320 |
4320 BLOCK_INPUT; | |
4321 status = NavDialogRun(dialogRef); | 4321 status = NavDialogRun(dialogRef); |
4322 UNBLOCK_INPUT; | |
4323 } | 4322 } |
4324 | 4323 |
4325 if (saveName) CFRelease(saveName); | 4324 if (saveName) CFRelease(saveName); |
4326 if (client) CFRelease(client); | 4325 if (client) CFRelease(client); |
4327 if (message) CFRelease(message); | 4326 if (message) CFRelease(message); |
4330 userAction = NavDialogGetUserAction(dialogRef); | 4329 userAction = NavDialogGetUserAction(dialogRef); |
4331 switch (userAction) | 4330 switch (userAction) |
4332 { | 4331 { |
4333 case kNavUserActionNone: | 4332 case kNavUserActionNone: |
4334 case kNavUserActionCancel: | 4333 case kNavUserActionCancel: |
4335 NavDialogDispose(dialogRef); | 4334 break; /* Treat cancel like C-g */ |
4336 Fsignal (Qquit, Qnil); /* Treat cancel like C-g */ | |
4337 return; | |
4338 case kNavUserActionOpen: | 4335 case kNavUserActionOpen: |
4339 case kNavUserActionChoose: | 4336 case kNavUserActionChoose: |
4340 case kNavUserActionSaveAs: | 4337 case kNavUserActionSaveAs: |
4341 { | 4338 { |
4342 NavReplyRecord reply; | 4339 NavReplyRecord reply; |
4367 /* Fall back on minibuffer if there was a problem */ | 4364 /* Fall back on minibuffer if there was a problem */ |
4368 file = Fcompleting_read (prompt, intern ("read-file-name-internal"), | 4365 file = Fcompleting_read (prompt, intern ("read-file-name-internal"), |
4369 dir, mustmatch, dir, Qfile_name_history, | 4366 dir, mustmatch, dir, Qfile_name_history, |
4370 default_filename, Qnil); | 4367 default_filename, Qnil); |
4371 } | 4368 } |
4369 UNBLOCK_INPUT; | |
4372 } | 4370 } |
4373 | 4371 |
4374 UNGCPRO; | 4372 UNGCPRO; |
4375 | 4373 |
4376 /* Make "Cancel" equivalent to C-g. */ | 4374 /* Make "Cancel" equivalent to C-g. */ |