* generic/tkInt.decls(tkIntXlib): added XQueryTree declaration for

	mac & aqua, since it's now called from ParentXId via Tk_HandleEvent.
	* generic/tkIntXlibDecls.h:
	* generic/tkStubInit.c: regen.
	* mac/tkMacXStubs.c: added XQueryTree stub

	* mac/tkMacEmbed.c (TkpUseWindow): check that container window
	has -container option set (sync with other platforms).

	* mac/tkMacBitmap.c:
	* mac/tkMacFont.c:
	* mac/tkMacSend.c:
	* mac/tkMacTest.c:
	* mac/tkMacWm.c: CONSTification.

	* mac/tkMacProjects.sea.hqx: added tkStyle.c and tkUndo.c to
	tk library projects.

3 files changed, 28 insertions, 3 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 52673ea..0a51233 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tkInt.decls,v 1.30 2002/08/31 06:12:20 das Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.31 2002/10/09 11:56:28 das Exp $
 
 library tk
 
@@ -2232,3 +2232,8 @@ declare 89 {mac aqua} {
     void XQueryColors (Display *display, Colormap colormap, \
 	    XColor *defs_in_out, int ncolors)
 }
+
+declare 90 {mac aqua} {
+    Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \
+	    Window** w4, unsigned int* ui)
+}
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 54f4fa1..829741f 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.15 2002/08/31 06:12:20 das Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.16 2002/10/09 11:56:33 das Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -651,6 +651,10 @@ EXTERN void		XQueryColor _ANSI_ARGS_((Display * display,
 EXTERN void		XQueryColors _ANSI_ARGS_((Display * display, 
 				Colormap colormap, XColor * defs_in_out, 
 				int ncolors));
+/* 90 */
+EXTERN Status		XQueryTree _ANSI_ARGS_((Display* d, Window w1, 
+				Window* w2, Window* w3, Window** w4, 
+				unsigned int* ui));
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 /* 0 */
@@ -937,6 +941,10 @@ EXTERN void		XQueryColor _ANSI_ARGS_((Display * display,
 EXTERN void		XQueryColors _ANSI_ARGS_((Display * display, 
 				Colormap colormap, XColor * defs_in_out, 
 				int ncolors));
+/* 90 */
+EXTERN Status		XQueryTree _ANSI_ARGS_((Display* d, Window w1, 
+				Window* w2, Window* w3, Window** w4, 
+				unsigned int* ui));
 #endif /* MAC_OSX_TK */
 
 typedef struct TkIntXlibStubs {
@@ -1143,6 +1151,7 @@ typedef struct TkIntXlibStubs {
     void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */
     void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
     void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
+    Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */
@@ -1235,6 +1244,7 @@ typedef struct TkIntXlibStubs {
     void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */
     void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
     void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
+    Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */
 #endif /* MAC_OSX_TK */
 } TkIntXlibStubs;
 
@@ -2040,6 +2050,10 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
 #endif
+#ifndef XQueryTree
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
+#endif
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef XSetDashes
@@ -2402,6 +2416,10 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
 #endif
+#ifndef XQueryTree
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
+#endif
 #endif /* MAC_OSX_TK */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index bf3e770..a8e5981 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.38 2002/08/31 06:12:27 das Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.39 2002/10/09 11:57:09 das Exp $
  */
 
 #include "tkInt.h"
@@ -714,6 +714,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XWarpPointer, /* 87 */
     XQueryColor, /* 88 */
     XQueryColors, /* 89 */
+    XQueryTree, /* 90 */
 #endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     XSetDashes, /* 0 */
@@ -806,6 +807,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XWarpPointer, /* 87 */
     XQueryColor, /* 88 */
     XQueryColors, /* 89 */
+    XQueryTree, /* 90 */
 #endif /* MAC_OSX_TK */
 };