summaryrefslogtreecommitdiffstats
path: root/doc/label.n
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-08-16 14:01:09 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-08-16 14:01:09 (GMT)
commit21742ef35eb0732a8e33f526626dcf61425d786b (patch)
tree67bf44f07cf01dd47f4f8dac1bcc04a6d5845d17 /doc/label.n
parent1e14a1b89b0b88db34b7fc5270cea85c85ac6cac (diff)
downloadtk-21742ef35eb0732a8e33f526626dcf61425d786b.zip
tk-21742ef35eb0732a8e33f526626dcf61425d786b.tar.gz
tk-21742ef35eb0732a8e33f526626dcf61425d786b.tar.bz2
Standardize the -compound option to everywhere it ought to be. [Bug 712588]
Diffstat (limited to 'doc/label.n')
-rw-r--r--doc/label.n24
1 files changed, 8 insertions, 16 deletions
diff --git a/doc/label.n b/doc/label.n
index 4b53889..cc377c4 100644
--- a/doc/label.n
+++ b/doc/label.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: label.n,v 1.6 2002/12/18 21:46:48 tmh Exp $
+'\" RCS: @(#) $Id: label.n,v 1.7 2004/08/16 14:01:10 dkf Exp $
'\"
.so man.macros
.TH label n 4.0 Tk "Tk Built-In Commands"
@@ -16,24 +16,16 @@ label \- Create and manipulate label widgets
.SH SYNOPSIS
\fBlabel\fR \fIpathName \fR?\fIoptions\fR?
.SO
-\-activebackground \-font \-pady
-\-activeforeground \-foreground \-relief
-\-anchor \-highlightbackground \-takefocus
-\-background \-highlightcolor \-text
-\-bitmap \-highlightthickness \-textvariable
-\-borderwidth \-image \-underline
+\-activebackground \-disabledforeground \-padx
+\-activeforeground \-font \-pady
+\-anchor \-foreground \-relief
+\-background \-highlightbackground \-takefocus
+\-bitmap \-highlightcolor \-text
+\-borderwidth \-highlightthickness \-textvariable
+\-compound \-image \-underline
\-cursor \-justify \-wraplength
-\-disabledforeground \-padx
.SE
.SH "WIDGET-SPECIFIC OPTIONS"
-.OP \-compound compound Compound
-Specifies whether the label should display both an image and text,
-and if so, where the image should be placed relative to the text.
-Valid values for this option are \fBbottom\fR, \fBcenter\fR,
-\fBleft\fR, \fBnone\fR, \fBright\fR and \fBtop\fR. The default value
-is \fBnone\fR, meaning that the label will display either an image or
-text, depending on the values of the \fB\-image\fR and \fB\-bitmap\fR
-options.
.OP \-height height Height
Specifies a desired height for the label.
If an image or bitmap is being displayed in the label then the value is in