summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/clipboard.n9
-rw-r--r--doc/selection.n8
3 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 68e312e..7895f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2001-06-03 Jeff Hobbs <jeffh@ActiveState.com>
+ * doc/selection.n:
+ * doc/clipboard.n: added SEE ALSOs to cross-reference selection
+ and clipboard, with extra note for clipboard command in selection
+ docs. [Patch #422256]
+
* unix/tkUnixFont.c: Corrected support for iso10646 (X11 Unicode)
fonts on Unix. This adds a ucs-2be (UCS-2 Big Endian) encoding in
Tk on Unix that is used for those fonts (X11 requires
diff --git a/doc/clipboard.n b/doc/clipboard.n
index 3417623..4efa208 100644
--- a/doc/clipboard.n
+++ b/doc/clipboard.n
@@ -5,10 +5,10 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: clipboard.n,v 1.3 2000/05/14 23:25:03 ericm Exp $
+'\" RCS: @(#) $Id: clipboard.n,v 1.4 2001/06/04 03:15:20 hobbs Exp $
'\"
.so man.macros
-.TH clipboard n 4.0 Tk "Tk Built-In Commands"
+.TH clipboard n 8.4 Tk "Tk Built-In Commands"
.BS
'\" Note: do not modify the .SH NAME line immediately below!
.SH NAME
@@ -77,12 +77,17 @@ This feature may be convenient if, for example, \fIdata\fR starts
with a \fB\-\fR.
.RE
.TP
+.VS 8.4
\fBclipboard get\fR ?\fB\-displayof\fR \fIwindow\fR? ?\fB\-type\fR?
Retrieve data from the clipboard on \fIwindow\fR's display.
\fIwindow\fR defaults to ".". \fIType\fR specifies the form in which
the data is to be returned and should be an atom name such as STRING
or FILE_NAME. \fIType\fR defaults to STRING. This command is
equivalent to \fBselection get -selection CLIPBOARD\fR.
+.VE 8.4
+
+.SH "SEE ALSO"
+selection
.SH KEYWORDS
clear, format, clipboard, append, selection, type
diff --git a/doc/selection.n b/doc/selection.n
index a67678b..44fda07 100644
--- a/doc/selection.n
+++ b/doc/selection.n
@@ -5,7 +5,7 @@
'\" See the file "license.terms" for information on usage and redistribution
'\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
'\"
-'\" RCS: @(#) $Id: selection.n,v 1.3 1999/06/03 18:50:45 stanton Exp $
+'\" RCS: @(#) $Id: selection.n,v 1.4 2001/06/04 03:15:20 hobbs Exp $
'\"
.so man.macros
.TH selection n 8.1 Tk "Tk Built-In Commands"
@@ -23,6 +23,9 @@ This command provides a Tcl interface to the X selection mechanism and
implements the full selection functionality described in the
X Inter-Client Communication Conventions Manual (ICCCM).
.PP
+Note that for management of the CLIPBOARD selection (see below), the
+\fBclipboard\fR command may also be used.
+.PP
The first argument to \fBselection\fR determines the format of the
rest of the arguments and the behavior of the command. The following
forms are currently supported:
@@ -126,5 +129,8 @@ If \fIcommand\fR is specified, it is a Tcl script to execute when
some other window claims ownership of the selection away from
\fIwindow\fR. \fISelection\fR defaults to PRIMARY.
+.SH "SEE ALSO"
+clipboard
+
.SH KEYWORDS
clear, format, handler, ICCCM, own, selection, target, type