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

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

2 files changed, 21 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ae0e15e..f8694a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-06-12  Daniel Steffen  <das@users.sourceforge.net>
+
+	* generic/ttk/ttkTreeview.c:	fix warning.
+
+	* 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 tclIORTrans.c; add tclOO
+	* macosx/Wish.xcodeproj/default.pbxuser: files to tktest-X11 target;
+	add debug targets for 64bit and with corefoundation disabled; updates
+	and 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
@@ -7,7 +25,7 @@
 2008-06-01  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/Wish.xcodeproj/project.pbxproj: add new tclOO files; add debug
-	* macosx/README:			targets with gcov; update to
+	* macosx/README:			configs with gcov; update to
 						Xcode 3.1.
 
 2008-05-27  Pat Thoyts  <patthoyts@users.sourceforge.net>
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 3f9c038..706c175 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.27 2008/05/03 21:12:55 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.28 2008/06/12 06:32:11 das Exp $
  */
 
 #include "tkMacOSXPrivate.h"
@@ -1306,5 +1306,5 @@ void
 Tk_ResetUserInactiveTime(
     Display *dpy)
 {
-    UpdateSystemActivity(OverallAct);
+    UpdateSystemActivity(UsrActivity);
 }