diff options
| author | hobbs <hobbs> | 2004-05-03 22:23:08 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2004-05-03 22:23:08 (GMT) |
| commit | aa114d8af1cf1ad366fc05366e1c3caf052d93a7 (patch) | |
| tree | f21e1f470165b77c99152ae0e76a22ffba6c2a69 /generic/tkClipboard.c | |
| parent | 0cae2f61a22eb7f4c3b41e2a569c03b86b79f4b4 (diff) | |
| download | tk-aa114d8af1cf1ad366fc05366e1c3caf052d93a7.zip tk-aa114d8af1cf1ad366fc05366e1c3caf052d93a7.tar.gz tk-aa114d8af1cf1ad366fc05366e1c3caf052d93a7.tar.bz2 | |
* generic/tkClipboard.c: Move TkClipCleanup from tkClipboard.c
* mac/tkMacXStubs.c: to being implemented in a platform
* macosx/tkMacOSXXStubs.c: specific manner. The cleanup order was
* unix/tkUnixEvent.c: bad at least on Windows, where we
* win/tkWinX.c: reset/cleared display info that was
still needed for the clipboard to render.
[Bug #939389, #822002, #732662]
Diffstat (limited to 'generic/tkClipboard.c')
| -rw-r--r-- | generic/tkClipboard.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index 2efdeac..5f23a90 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkClipboard.c,v 1.12 2002/08/05 04:30:38 dgp Exp $ + * RCS: @(#) $Id: tkClipboard.c,v 1.12.2.1 2004/05/03 22:23:08 hobbs Exp $ */ #include "tkInt.h" @@ -623,42 +623,6 @@ Tk_ClipboardObjCmd(clientData, interp, objc, objv) /* *---------------------------------------------------------------------- * - * TkClipCleanup -- - * - * This procedure is called to cleanup resources associated with - * claiming clipboard ownership and for receiving selection get - * results. This function is called in tkWindow.c. This has to be - * called by the display cleanup function because we still need the - * access display elements. - * - * Results: - * None. - * - * Side effects: - * Resources are freed - the clipboard may no longer be used. - * - *---------------------------------------------------------------------- - */ - -void -TkClipCleanup(dispPtr) - TkDisplay *dispPtr; /* display associated with clipboard */ -{ - if (dispPtr->clipWindow != NULL) { - Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, - dispPtr->applicationAtom); - Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, - dispPtr->windowAtom); - - Tk_DestroyWindow(dispPtr->clipWindow); - Tcl_Release((ClientData) dispPtr->clipWindow); - dispPtr->clipWindow = NULL; - } -} - -/* - *---------------------------------------------------------------------- - * * TkClipInit -- * * This procedure is called to initialize the window for claiming |