diff options
author | fvogel <fvogelnew1@free.fr> | 2020-10-31 13:50:34 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2020-10-31 13:50:34 (GMT) |
commit | e94fd8743a262352c92254068ace3aa9a3d4091f (patch) | |
tree | 8a73e28949bf96ad1f0c2b5d5255e8cf5ca2bbd3 /doc/ttk_entry.n | |
parent | 435c6f571f198386f1c1a1334b5ab8decab617e1 (diff) | |
parent | 3bf399cf155634481915b654fab4a4b7a743414d (diff) | |
download | tk-e94fd8743a262352c92254068ace3aa9a3d4091f.zip tk-e94fd8743a262352c92254068ace3aa9a3d4091f.tar.gz tk-e94fd8743a262352c92254068ace3aa9a3d4091f.tar.bz2 |
Merge trunk, and fix conflict in tests/ttk/scrollbar.test (due to [33556bc9]).
Diffstat (limited to 'doc/ttk_entry.n')
-rw-r--r-- | doc/ttk_entry.n | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n index 6d4a015..816c08b 100644 --- a/doc/ttk_entry.n +++ b/doc/ttk_entry.n @@ -26,7 +26,7 @@ standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command. \-class \-cursor \-font \-foreground \-style -\-takefocus \-xscrollcommand \-placeholder +\-takefocus \-xscrollcommand \-placeholder \-placeholderforeground .SE .SH "WIDGET-SPECIFIC OPTIONS" .OP \-exportselection exportSelection ExportSelection @@ -424,12 +424,16 @@ Some themes use a graphical background and their field background colors cannot .RE \fB\-foreground\fP \fIcolor\fP .br +\fB\-insertcolor\fP \fIcolor\fP +.br \fB\-insertwidth\fP \fIamount\fP .br \fB\-lightcolor\fP \fIcolor\fP .br \fB\-padding\fP \fIpadding\fP .br +\fB\-placeholderforeground\fP \fIcolor\fP +.br \fB\-relief\fP \fIrelief\fP .br \fB\-selectbackground\fP \fIcolor\fP |