summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2020-01-01 15:29:34 (GMT)
committerfvogel <fvogelnew1@free.fr>2020-01-01 15:29:34 (GMT)
commit789fefef4c9c8cd6433a86b1712c1a7ed0ca3bee (patch)
tree96041030d0ffd702a9a5b745b2ff3de78368ec51 /doc
parent7c5f83bfa0d7fe0574aea27159fe5363866913c2 (diff)
downloadtk-789fefef4c9c8cd6433a86b1712c1a7ed0ca3bee.zip
tk-789fefef4c9c8cd6433a86b1712c1a7ed0ca3bee.tar.gz
tk-789fefef4c9c8cd6433a86b1712c1a7ed0ca3bee.tar.bz2
Document the change of default value for the -compound widget option.
Diffstat (limited to 'doc')
-rw-r--r--doc/ttk_intro.n2
-rw-r--r--doc/ttk_widget.n5
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/ttk_intro.n b/doc/ttk_intro.n
index 07e071b..581cb44 100644
--- a/doc/ttk_intro.n
+++ b/doc/ttk_intro.n
@@ -60,7 +60,7 @@ For example, the \fBtext\fR element
(which displays a text string) has
\fB\-text\fR, \fB\-font\fR, \fB\-foreground\fR, \fB\-background\fR,
\fB\-underline\fR, and \fB\-width\fR options.
-The value of an element option is taken from:
+The value of an element option is taken from (in precedence order):
.IP \(bu
an option of the same name and type in the widget containing the element;
.IP \(bu
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 281ce74..51c0dbd 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -74,6 +74,9 @@ and other button-like widgets:
.OP \-compound compound Compound
Specifies how to display the image relative to the text,
in the case both \fB\-text\fR and \fB\-image\fR are present.
+If set to the empty string (the default), the rules described in the
+"Elements" section of \fIttk::intro(n)\fR explain which value is actually
+used.
Valid values are:
.RS
.IP text
@@ -88,7 +91,7 @@ Display text centered on top of image.
.IP right
Display image above, below, left of, or right of the text, respectively.
.IP none
-The default; display the image if present, otherwise the text.
+Display the image if present, otherwise the text.
.RE
.OP \-image image Image
Specifies an image to display.