* macosx/tkMacOSXXStubs.c (Tk_ResetUserInactiveTime): use UsrActivity

	instead of OverallAct (which may be ignored in some circumstances).

2 files changed, 18 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 66abae8..3b44c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-06-12  Daniel Steffen  <das@users.sourceforge.net>
+
+	* unix/tcl.m4 (SunOS-5.11): fix 64bit amd64 support with gcc & Sun cc.
+	* unix/configure: autoconf-2.59
+
+	* macosx/tkMacOSXXStubs.c (Tk_ResetUserInactiveTime): use UsrActivity
+	instead of OverallAct (which may be ignored in some circumstances).
+
+	* macosx/Wish.xcodeproj/project.pbxproj: add debug configs for 64bit,
+	* macosx/Wish.xcodeproj/default.pbxuser: with gcov, and with
+	corefoundation disabled; updates & cleanup for Xcode 3.1 and for
+	Leopard; sync with Tcl.xcodeproj.
+	* macosx/Wish.xcode/project.pbxproj:	sync Wish.xcodeproj changes.
+	* macosx/Wish.xcode/default.pbxuser:
+	* macosx/README:			document new build configs.
+
 2008-06-10  Joe English  <jenglish@users.sourceforge.net>
 
 	* unix/tkUnixKey.c: tkUnixKey.c: Use Xutf8LookupString if available
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index f7f0f8a..ff25774 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.25.2.1 2008/05/03 21:09:16 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.25.2.2 2008/06/12 06:36:07 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -1306,5 +1306,5 @@ void
 Tk_ResetUserInactiveTime(
     Display *dpy)
 {
-    UpdateSystemActivity(OverallAct);
+    UpdateSystemActivity(UsrActivity);
 }