diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-05 13:12:04 (GMT) |
commit | 0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c (patch) | |
tree | e941d8cac470415eab1469160234f7ec7dd217a9 /win/tkWinClipboard.c | |
parent | fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6 (diff) | |
parent | e35d614587b25a1a03ededdf2d04bcbfca86be70 (diff) | |
download | tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.zip tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.gz tk-0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c.tar.bz2 |
merge core-8-4-branchbug_3508771
Diffstat (limited to 'win/tkWinClipboard.c')
-rw-r--r-- | win/tkWinClipboard.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c index 97d809c..38037c2 100644 --- a/win/tkWinClipboard.c +++ b/win/tkWinClipboard.c @@ -1,4 +1,4 @@ -/* +/* * tkWinClipboard.c -- * * This file contains functions for managing the clipboard. @@ -23,7 +23,7 @@ static void UpdateClipboard _ANSI_ARGS_((HWND hwnd)); * Retrieve the specified selection from another process. For * now, only fetching XA_STRING from CLIPBOARD is supported. * Eventually other types should be allowed. - * + * * Results: * The return value is a standard Tcl return value. * If an error occurs (such as no selection exists) @@ -98,10 +98,9 @@ TkSelGetSelection(interp, tkwin, selection, target, proc, clientData) Tcl_DStringInit(&ds); Tcl_DStringAppend(&ds, "cp######", -1); data = GlobalLock(handle); - /* - * Even though the documentation claims that GetLocaleInfo + * Even though the documentation claims that GetLocaleInfo * expects an LCID, on Windows 9x it really seems to expect * a LanguageID. */ @@ -144,7 +143,7 @@ TkSelGetSelection(interp, tkwin, selection, target, proc, clientData) /* * Translate CR/LF to LF. */ - + data = destPtr = Tcl_DStringValue(&ds); while (*data) { if (data[0] == '\r' && data[1] == '\n') { @@ -163,7 +162,7 @@ TkSelGetSelection(interp, tkwin, selection, target, proc, clientData) Tcl_DStringFree(&ds); CloseClipboard(); return result; - + error: Tcl_AppendResult(interp, Tk_GetAtomName(tkwin, selection), " selection doesn't exist or form \"", @@ -218,7 +217,7 @@ XSetSelectionOwner(display, selection, owner, time) UpdateClipboard(hwnd); } } - return 0; + return Success; } /* @@ -404,7 +403,7 @@ UpdateClipboard(hwnd) * TkSelEventProc -- * * This procedure is invoked whenever a selection-related - * event occurs. + * event occurs. * * Results: * None. |