summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-22 08:54:22 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-11-22 08:54:22 (GMT)
commit20a005ef0c7ab42b7f4f703572c56ac2af790137 (patch)
tree295f11b07b62234a45581c7e7e7d58a8a02c01d3 /doc
parent371daa9f78b7f888ce06ec270477e2dc174a54a1 (diff)
parent8e65c4de1acc5309017fcc308dc64b435509e719 (diff)
downloadtk-20a005ef0c7ab42b7f4f703572c56ac2af790137.zip
tk-20a005ef0c7ab42b7f4f703572c56ac2af790137.tar.gz
tk-20a005ef0c7ab42b7f4f703572c56ac2af790137.tar.bz2
Merge trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ttk_button.n2
-rw-r--r--doc/ttk_checkbutton.n2
-rw-r--r--doc/ttk_label.n2
-rw-r--r--doc/ttk_menubutton.n2
-rw-r--r--doc/ttk_notebook.n2
-rw-r--r--doc/ttk_radiobutton.n2
-rw-r--r--doc/ttk_treeview.n2
7 files changed, 13 insertions, 1 deletions
diff --git a/doc/ttk_button.n b/doc/ttk_button.n
index 2b091ad..eb40d9d 100644
--- a/doc/ttk_button.n
+++ b/doc/ttk_button.n
@@ -72,6 +72,8 @@ are:
.br
\fB\-bordercolor\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-darkcolor\fP \fIcolor\fP
.br
\fB\-foreground\fP \fIcolor\fP
diff --git a/doc/ttk_checkbutton.n b/doc/ttk_checkbutton.n
index a18a886..c78dc0e 100644
--- a/doc/ttk_checkbutton.n
+++ b/doc/ttk_checkbutton.n
@@ -80,6 +80,8 @@ are:
.PP
\fB\-background\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-foreground\fP \fIcolor\fP
.br
\fB\-indicatorbackground\fP \fIcolor\fP
diff --git a/doc/ttk_label.n b/doc/ttk_label.n
index 8553a08..1b25f9f 100644
--- a/doc/ttk_label.n
+++ b/doc/ttk_label.n
@@ -56,6 +56,8 @@ are:
.PP
\fB\-background\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-foreground\fP \fIcolor\fP
.br
\fB\-font\fP \fIfont\fP
diff --git a/doc/ttk_menubutton.n b/doc/ttk_menubutton.n
index 76d3829..0d80c1e 100644
--- a/doc/ttk_menubutton.n
+++ b/doc/ttk_menubutton.n
@@ -58,6 +58,8 @@ are:
.br
\fB\-background\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-foreground\fP \fIcolor\fP
.br
\fB\-font\fP \fIfont\fP
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index 19416b5..ae32a44 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -242,6 +242,8 @@ are:
.br
\fB\-bordercolor\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-expand\fP \fIpadding\fP
.RS
Defines how much the tab grows in size. Usually used with the
diff --git a/doc/ttk_radiobutton.n b/doc/ttk_radiobutton.n
index 1344ae2..2dc84be 100644
--- a/doc/ttk_radiobutton.n
+++ b/doc/ttk_radiobutton.n
@@ -77,6 +77,8 @@ are:
.PP
\fB\-background\fP \fIcolor\fP
.br
+\fB\-compound\fP \fIcompound\fP
+.br
\fB\-foreground\fP \fIcolor\fP
.br
\fB\-indicatorbackground\fP \fIcolor\fP
diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n
index 125cc78..2deb5b5 100644
--- a/doc/ttk_treeview.n
+++ b/doc/ttk_treeview.n
@@ -235,7 +235,7 @@ A data cell.
Returns the item ID of the item at position \fIy\fR.
.TP
\fIpathname \fBidentify column \fIx y\fR
-Returns the data column identifier of the cell at position \fIx\fR.
+Returns the display column identifier of the cell at position \fIx\fR.
The tree column has ID \fB#0\fR.
.TP
\fIpathname \fBidentify element \fIx y\fR