diff options
author | wolfsuit <wolfsuit> | 2004-02-16 00:42:33 (GMT) |
---|---|---|
committer | wolfsuit <wolfsuit> | 2004-02-16 00:42:33 (GMT) |
commit | bd2e07339a6724dce174ffd6cbd6b66677db3f2f (patch) | |
tree | 12bebf3e6d48b35ab147bf17d2c87861606f8460 /macosx/tkMacOSXClipboard.c | |
parent | da1ae8f179cd0cef93eef9f5ff61ea47d54340af (diff) | |
download | tk-bd2e07339a6724dce174ffd6cbd6b66677db3f2f.zip tk-bd2e07339a6724dce174ffd6cbd6b66677db3f2f.tar.gz tk-bd2e07339a6724dce174ffd6cbd6b66677db3f2f.tar.bz2 |
Backport Mac OS X specific fixes from TOT. See ChangeLog for details.
In tk_getOpenFile filters, handle the case where you have a Macintosh
file type and the files have no filetype.
Fix various formatting nits.
Diffstat (limited to 'macosx/tkMacOSXClipboard.c')
-rw-r--r-- | macosx/tkMacOSXClipboard.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index 3c083e1..acfd94c 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.2 2003/11/11 18:21:09 hobbs Exp $ + * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.3 2004/02/16 00:42:34 wolfsuit Exp $ */ #include "tkInt.h" @@ -66,7 +66,7 @@ TkSelGetSelection( * Get the scrap from the Macintosh global clipboard. */ - err=GetCurrentScrap(&scrapRef); + err = GetCurrentScrap(&scrapRef); if (err != noErr) { Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection), " GetCurrentScrap failed.", (char *) NULL); @@ -340,8 +340,11 @@ TkSuspendClipboard() ClearCurrentScrap(); GetCurrentScrap(&scrapRef); - Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, length, &encodedText); - PutScrapFlavor(scrapRef, 'TEXT', 0, Tcl_DStringLength(&encodedText), Tcl_DStringValue(&encodedText) ); + Tcl_UtfToExternalDString(TkMacOSXCarbonEncoding, buffer, + length, &encodedText); + PutScrapFlavor(scrapRef, 'TEXT', 0, + Tcl_DStringLength(&encodedText), + Tcl_DStringValue(&encodedText) ); Tcl_DStringFree(&encodedText); /* |