summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2018-05-01 19:01:40 (GMT)
committerfvogel <fvogelnew1@free.fr>2018-05-01 19:01:40 (GMT)
commit52935236490127f9c871a45a2cfbb55abb9d8ed3 (patch)
treec1af847efcdcb54f1e3acc08e1463f9e5a796314 /doc
parent54fd694bcc952fde173ef86cbdcd204c5f6fcca3 (diff)
parentae446c1afd1d7832f4cd3f842672056b6c5c8fff (diff)
downloadtk-52935236490127f9c871a45a2cfbb55abb9d8ed3.zip
tk-52935236490127f9c871a45a2cfbb55abb9d8ed3.tar.gz
tk-52935236490127f9c871a45a2cfbb55abb9d8ed3.tar.bz2
merge trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/Inactive.36
-rw-r--r--doc/busy.n2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/Inactive.3 b/doc/Inactive.3
index d0fccf1..42ae5b8 100644
--- a/doc/Inactive.3
+++ b/doc/Inactive.3
@@ -14,7 +14,7 @@ Tk_GetUserInactiveTime, Tk_ResetUserInactiveTime \- discover user inactivity tim
long
\fBTk_GetUserInactiveTime(\fIdisplay\fB)\fR
.sp
-\fBTk_GetUserInactiveTime(\fIdisplay\fB)\fR
+\fBTk_ResetUserInactiveTime(\fIdisplay\fB)\fR
.SH ARGUMENTS
.AS Display *display
.AP Display *display in
@@ -26,8 +26,8 @@ reset.
\fBTk_GetUserInactiveTime\fR returns the number of milliseconds that
have passed since the last user interaction (usually via keyboard or
mouse) with the respective display. On systems and displays that do not
-support querying the user inactiviy time, \fB\-1\fR is returned.
-\fBTk_GetUserInactiveTime\fR resets the user inactivity timer of the
+support querying the user inactivity time, \fB\-1\fR is returned.
+\fBTk_ResetUserInactiveTime\fR resets the user inactivity timer of the
given display to zero. On windowing systems that do not support
multiple displays \fIdisplay\fR can be passed as \fBNULL\fR.
.SH KEYWORDS
diff --git a/doc/busy.n b/doc/busy.n
index 71ae68a..3274524 100644
--- a/doc/busy.n
+++ b/doc/busy.n
@@ -170,12 +170,12 @@ option add *Frame.BusyCursor gumby
.CE
.RE
.TP
-.TP
\fBtk busy current \fR?\fIpattern\fR?
.
Returns the pathnames of all widgets that are currently busy. If a
\fIpattern\fR is given, only the path names of busy widgets matching
\fIpattern\fR are returned.
+.TP
\fBtk busy forget \fIwindow\fR ?\fIwindow\fR?...
.
Releases resources allocated by the \fBtk busy\fR command for \fIwindow\fR,