diff options
| author | das <das> | 2008-06-12 06:38:57 (GMT) |
|---|---|---|
| committer | das <das> | 2008-06-12 06:38:57 (GMT) |
| commit | a11944430be54d3070d9bc3fd3f168c6b4c326f7 (patch) | |
| tree | b564a6a6ae568b76e5e3bc1ace87217b52521339 | |
| parent | 25b7f95707cf231a0442dcc94721b5fca8fdb8f8 (diff) | |
| download | tk-a11944430be54d3070d9bc3fd3f168c6b4c326f7.zip tk-a11944430be54d3070d9bc3fd3f168c6b4c326f7.tar.gz tk-a11944430be54d3070d9bc3fd3f168c6b4c326f7.tar.bz2 | |
* macosx/tkMacOSXXStubs.c: sync with core-8-5-branch.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2008-06-12 Daniel Steffen <das@users.sourceforge.net> + + * macosx/tkMacOSXXStubs.c: sync with core-8-5-branch. + + * unix/tcl.m4 (SunOS-5.11): fix 64bit amd64 support with gcc & Sun cc. + * unix/configure: autoconf-2.13 + 2008-04-17 Don Porter <dgp@users.sourceforge.net> *** 8.4.19 TAGGED FOR RELEASE *** diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 1f48753..56da670 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.20 2007/11/09 06:26:57 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2.2.21 2008/06/12 06:38:57 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -1284,6 +1284,6 @@ Tk_GetUserInactiveTime(Display *dpy) void Tk_ResetUserInactiveTime(Display *dpy) { - UpdateSystemActivity(OverallAct); + UpdateSystemActivity(UsrActivity); } #endif |