diff options
| author | das <das> | 2007-06-23 00:27:11 (GMT) |
|---|---|---|
| committer | das <das> | 2007-06-23 00:27:11 (GMT) |
| commit | 906337cc23867860eddecd0d9e875e45102df910 (patch) | |
| tree | df8d962896295bf1a5005e6a885df65adf629b04 /macosx/tkMacOSXDialog.c | |
| parent | 38d17f35a89f5fafcba83303e7e244fe0f23967c (diff) | |
| download | tk-906337cc23867860eddecd0d9e875e45102df910.zip tk-906337cc23867860eddecd0d9e875e45102df910.tar.gz tk-906337cc23867860eddecd0d9e875e45102df910.tar.bz2 | |
* macosx/tkMacOSXXStubs.c (XCreateImage, DestroyImage): correct XImage
bytes_per_line/bitmap_pad calculations and endianness setting; free
image data and XImage structure at destruction; formatting cleanup.
* macosx/tkMacOSXDialog.c (NavServicesGetFile): disable app-modal
sheet variant of nav dialog on OS versions where it causes problems.
Diffstat (limited to 'macosx/tkMacOSXDialog.c')
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index c496cbf..b28b444 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.14 2007/05/09 12:57:46 das Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.15 2007/06/23 00:27:11 das Exp $ */ #include "tkMacOSXInt.h" @@ -776,10 +776,17 @@ NavServicesGetFile( TkMacOSXHostToplevelExists(parent)) { options.parentWindow = GetWindowFromPort(TkMacOSXGetDrawablePort( Tk_WindowId(parent))); - if (options.parentWindow) { - options.modality = kWindowModalityWindowModal; - data.sheet = 1; - } + TK_IF_HI_TOOLBOX (5, + /* + * Impossible to modify dialog modality with the Cocoa-based + * NavServices implementation. + */ + ) TK_ELSE_HI_TOOLBOX (5, + if (options.parentWindow) { + options.modality = kWindowModalityWindowModal; + data.sheet = 1; + } + ) TK_ENDIF } /* |