* generic/tkDecls.h:

	* generic/tkIntPlatDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c: ran missing 'make genstubs' for TIP245 changes
	to tk.decls

	* macosx/tkMacOSXXStubs.c (Tk_ResetUserInactiveTime): use symbolic
	constant argument in call to UpdateSystemActivity();

	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/Wish.xcode/project.pbxproj:
	* unix/configure.in: added/corrected linking to IOKit.framework for
	TIP245.

	* unix/configure.in: skip X11 configure checks when building tk_aqua.
	* unix/configure: autoconf-2.59

4 files changed, 26 insertions, 48 deletions

diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index d666a44..a7cbebd 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkDecls.h,v 1.25 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.26 2005/05/29 06:47:04 das Exp $
  */
 
 #ifndef _TKDECLS
@@ -1735,6 +1735,16 @@ EXTERN int		Tk_PhotoPutZoomedBlock _ANSI_ARGS_((
 EXTERN int		Tk_PhotoSetSize _ANSI_ARGS_((Tcl_Interp * interp, 
 				Tk_PhotoHandle handle, int width, int height));
 #endif
+#ifndef Tk_GetUserInactiveTime_TCL_DECLARED
+#define Tk_GetUserInactiveTime_TCL_DECLARED
+/* 269 */
+EXTERN long		Tk_GetUserInactiveTime _ANSI_ARGS_((Display * dpy));
+#endif
+#ifndef Tk_ResetUserInactiveTime_TCL_DECLARED
+#define Tk_ResetUserInactiveTime_TCL_DECLARED
+/* 270 */
+EXTERN void		Tk_ResetUserInactiveTime _ANSI_ARGS_((Display * dpy));
+#endif
 
 typedef struct TkStubHooks {
     struct TkPlatStubs *tkPlatStubs;
@@ -2016,6 +2026,8 @@ typedef struct TkStubs {
     int (*tk_PhotoPutBlock) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int compRule)); /* 266 */
     int (*tk_PhotoPutZoomedBlock) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock * blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule)); /* 267 */
     int (*tk_PhotoSetSize) _ANSI_ARGS_((Tcl_Interp * interp, Tk_PhotoHandle handle, int width, int height)); /* 268 */
+    long (*tk_GetUserInactiveTime) _ANSI_ARGS_((Display * dpy)); /* 269 */
+    void (*tk_ResetUserInactiveTime) _ANSI_ARGS_((Display * dpy)); /* 270 */
 } TkStubs;
 
 #ifdef __cplusplus
@@ -3102,6 +3114,14 @@ extern TkStubs *tkStubsPtr;
 #define Tk_PhotoSetSize \
 	(tkStubsPtr->tk_PhotoSetSize) /* 268 */
 #endif
+#ifndef Tk_GetUserInactiveTime
+#define Tk_GetUserInactiveTime \
+	(tkStubsPtr->tk_GetUserInactiveTime) /* 269 */
+#endif
+#ifndef Tk_ResetUserInactiveTime
+#define Tk_ResetUserInactiveTime \
+	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
+#endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index aa27eb1..1c6cbd9 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.21 2005/01/07 15:18:02 chengyemao Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.22 2005/05/29 06:47:04 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -230,16 +230,6 @@ EXTERN void		TkWinSetHINSTANCE _ANSI_ARGS_((HINSTANCE hInstance));
 /* 35 */
 EXTERN int		TkWinGetPlatformTheme _ANSI_ARGS_((void));
 #endif
-#ifndef TkWinCleanupContainerList_TCL_DECLARED
-#define TkWinCleanupContainerList_TCL_DECLARED
-/* 36 */
-EXTERN void		TkWinCleanupContainerList _ANSI_ARGS_((void));
-#endif
-#ifndef TkpWmGetState_TCL_DECLARED
-#define TkpWmGetState_TCL_DECLARED
-/* 37 */
-EXTERN int		TkpWmGetState _ANSI_ARGS_((TkWindow * winPtr));
-#endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
@@ -621,8 +611,6 @@ typedef struct TkIntPlatStubs {
     int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */
     void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */
     int (*tkWinGetPlatformTheme) _ANSI_ARGS_((void)); /* 35 */
-    void (*tkWinCleanupContainerList) _ANSI_ARGS_((void)); /* 36 */
-    int (*tkpWmGetState) _ANSI_ARGS_((TkWindow * winPtr)); /* 36 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
@@ -853,14 +841,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
 #endif
-#ifndef TkWinCleanupContainerList
-#define TkWinCleanupContainerList \
-	(tkIntPlatStubsPtr->tkWinCleanupContainerList) /* 36 */
-#endif
-#ifndef TkpWmGetState
-#define TkpWmGetState \
-	(tkIntPlatStubsPtr->tkpWmGetState) /* 37 */
-#endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 419b1bc..db6719d 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.10 2004/12/28 08:44:48 chengyemao Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.11 2005/05/29 06:47:04 das Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -65,16 +65,6 @@ EXTERN int		Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd,
 				UINT message, WPARAM wParam, LPARAM lParam, 
 				LRESULT * result));
 #endif
-#ifndef Tk_GetMenuHWND_TCL_DECLARED
-#define Tk_GetMenuHWND_TCL_DECLARED
-/* 6 */
-EXTERN HWND		Tk_GetMenuHWND _ANSI_ARGS_((Tk_Window tkwin));
-#endif
-#ifndef Tk_GetEmbeddedMenuHWND_TCL_DECLARED
-#define Tk_GetEmbeddedMenuHWND_TCL_DECLARED
-/* 7 */
-EXTERN HWND		Tk_GetEmbeddedMenuHWND _ANSI_ARGS_((Tk_Window tkwin));
-#endif 
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED
@@ -155,8 +145,6 @@ typedef struct TkPlatStubs {
     Tk_Window (*tk_HWNDToWindow) _ANSI_ARGS_((HWND hwnd)); /* 3 */
     void (*tk_PointerEvent) _ANSI_ARGS_((HWND hwnd, int x, int y)); /* 4 */
     int (*tk_TranslateWinEvent) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result)); /* 5 */
-    HWND (*tk_GetMenuHWND) _ANSI_ARGS_((Tk_Window tkwin)); /* 6 */
-    HWND (*tk_GetEmbeddedMenuHWND) _ANSI_ARGS_((Tk_Window tkwin)); /* 7 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */
@@ -212,14 +200,6 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define Tk_TranslateWinEvent \
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
 #endif
-#ifndef Tk_GetMenuHWND
-#define Tk_GetMenuHWND \
-	(tkPlatStubsPtr->tk_GetMenuHWND) /* 6 */
-#endif
-#ifndef Tk_GetEmbeddedMenuHWND
-#define Tk_GetEmbeddedMenuHWND \
-	(tkPlatStubsPtr->tk_GetEmbeddedMenuHWND) /* 7 */
-#endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
 #ifndef Tk_MacOSXSetEmbedHandler
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 0b81411..bc415e5 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.49 2005/01/07 15:18:03 chengyemao Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.50 2005/05/29 06:47:05 das Exp $
  */
 
 #include "tkInt.h"
@@ -336,8 +336,6 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkWinGetPlatformId, /* 33 */
     TkWinSetHINSTANCE, /* 34 */
     TkWinGetPlatformTheme, /* 35 */
-    TkWinCleanupContainerList, /* 36 */
-    TkpWmGetState, /* 37 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     TkGenerateActivateEvents, /* 0 */
@@ -629,8 +627,6 @@ TkPlatStubs tkPlatStubs = {
     Tk_HWNDToWindow, /* 3 */
     Tk_PointerEvent, /* 4 */
     Tk_TranslateWinEvent, /* 5 */
-    Tk_GetMenuHWND, /* 6 */
-    Tk_GetEmbeddedMenuHWND, /* 7 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
     Tk_MacOSXSetEmbedHandler, /* 0 */
@@ -926,6 +922,8 @@ TkStubs tkStubs = {
     Tk_PhotoPutBlock, /* 266 */
     Tk_PhotoPutZoomedBlock, /* 267 */
     Tk_PhotoSetSize, /* 268 */
+    Tk_GetUserInactiveTime, /* 269 */
+    Tk_ResetUserInactiveTime, /* 270 */
 };
 
 /* !END!: Do not edit above this line. */