*** macosx-8-4-branch merged into the mainline [tcl patch #602770] ***

	* generic/tk.decls:
	* generic/tkInt.decls: added new "aqua" specific entries to the
	stubs tables. Changed all "unix" entries to "x11" to allow us to
	distinguish and build both "aqua" on MacOSX and "x11" on MacOSX.

	* generic/tk.h: added a #ifnded RESOURCE_INCLUDED so that tk.h can
	be passed to the resource compiler.

	* generic/tkCmds.c (Tk_TkObjCmd): added [tk windowingsystem]
	subcommand: returns "x11" when running on X11, "win32" on Windows,
	"classic" on MacOS9 and "aqua" on MacOSX Aqua (i.e. Carbon)

	* generic/tkFont.c (TkFontGetFirstTextLayout): new private function
	returning the first chunk of a Tk_TextLayout, i.e. until the first
	font change on the first line (or the whole first line if there is
	no such font change).

	* generic/tkMain.c: made Tcl_ThreadDataKey static

	* library/demos/puzzle.tcl: fixed button metrics for aqua

	* tests/cursor.test: check for presence of arrow cursor instead of
	heart cursor

	* xlib/xcolors.c: changed xColors static initialization to more
	standard C

	* macosx/Wish.pbproj/jingham.pbxuser (new):
	* macosx/Wish.pbproj/project.pbxproj (new): project for Apple's
	ProjectBuilder IDE.

	* macosx/Makefile (new): simple makefile for building the project
	from the command line via the ProjectBuilder tool 'pbxbuild'.

	* macosx/tkMacOSXAppInit.c (new): macosx specific AppInit looking
	for a AppMain.tcl file in its bundled Resources/Scripts folder. If
	present, argv[1] is set to that file and the Scripts folder is
	added to the auto_path. This allows tk apps to embed scripts within
	their bundle directory structure.

	* macosx/tkMacOSXInit.c (new): macosx adapted version of
	tkUnixInit.c: we initialize & cache the Carbon native encoding
	(e.g. 'macRoman') and try to find the tk script library files
	inside Tk packaged as a framework.

	* macosx/tkMacOSXNotify.c (new): new macosx specific merged
	Carbon/select-based notifier.

	* macosx/tkMacOSXEvent.c (new):
	* macosx/tkMacOSXEvent.h (new):
	* macosx/tkMacOSXKeyEvent.c (new):
	* macosx/tkMacOSXMouseEvent.c (new):
	* macosx/tkMacOSXWindowEvent.c (new): new macosx specific event
	handling functionality.

	* macosx/tkMacOSX.h (new):
	* macosx/tkMacOSXBitmap.c (new):
	* macosx/tkMacOSXButton.c (new):
	* macosx/tkMacOSXClipboard.c (new):
	* macosx/tkMacOSXColor.c (new):
	* macosx/tkMacOSXConfig.c (new):
	* macosx/tkMacOSXCursor.c (new):
	* macosx/tkMacOSXDefault.h (new):
	* macosx/tkMacOSXDialog.c (new):
	* macosx/tkMacOSXDraw.c (new):
	* macosx/tkMacOSXEmbed.c (new):
	* macosx/tkMacOSXFont.c (new):
	* macosx/tkMacOSXHLEvents.c (new):
	* macosx/tkMacOSXInt.h (new):
	* macosx/tkMacOSXKeyboard.c (new):
	* macosx/tkMacOSXMenu.c (new):
	* macosx/tkMacOSXMenubutton.c (new):
	* macosx/tkMacOSXMenus.c (new):
	* macosx/tkMacOSXPort.h (new):
	* macosx/tkMacOSXRegion.c (new):
	* macosx/tkMacOSXScale.c (new):
	* macosx/tkMacOSXScrlbr.c (new):
	* macosx/tkMacOSXSubwindows.c (new):
	* macosx/tkMacOSXTest.c (new):
	* macosx/tkMacOSXUtil.c (new):
	* macosx/tkMacOSXUtil.h (new):
	* macosx/tkMacOSXWm.c (new):
	* macosx/tkMacOSXWm.h (new):
	* macosx/tkMacOSXXStubs.c (new): macosx ports of classic mac Tk
	implementation in tk/mac.

	* macosx/tkMacOSXSend.c (new): only send to local interp
	implemented currently.

	* macosx/tkMacOSXDebug.h (new):
	* macosx/tkMacOSXDebug.c (new): new macosx specific functions for
	debugging MacOS events, regions, etc.

	* macosx/tkAboutDlg.r (new):
	* macosx/tkMacOSXApplication.r (new):
	* macosx/tkMacOSXCursors.r (new):
	* macosx/tkMacOSXLibrary.r (new):
	* macosx/tkMacOSXMenu.r (new):
	* macosx/tkMacOSXResource.r (new):
	* macosx/tkMacOSXXCursors.r (new):
	* macosx/tclets.r (new): sources for Rez resource compiler.

	* macosx/Wish.icns (new): Wish application icon.

	* generic/tk.h:
	* generic/default.h:
	* generic/tkBind.c:
	* generic/tkCmds.c:
	* generic/tkGrab.c:
	* generic/tkPointer.c:
	* generic/tkPort.h:
	* generic/tkSelect.c:
	* generic/tkStubLib.c:
	* generic/tkTest.c:
	* generic/tkText.c:
	* generic/tkWindow.c:
	* unix/tkUnix3d.c:
	* xlib/xgc.c:
	* xlib/X11/X.h:
	* xlib/X11/Xlib.h:
	* xlib/X11/Xutil.h: added #includes and #ifdefs for macosx

	* library/bgerror.tcl:
	* library/button.tcl:
	* library/console.tcl:
	* library/dialog.tcl:
	* library/entry.tcl:
	* library/listbox.tcl:
	* library/menu.tcl:
	* library/msgbox.tcl:
	* library/scrlbar.tcl:
	* library/spinbox.tcl:
	* library/text.tcl:
	* library/tk.tcl:
	* library/demos/menu.tcl:
	* library/demos/menubu.tcl:
	* library/demos/widget: check [tk windowingsystem] instead of
	and/or in addition to $tcl_platform(platform).

	* generic/tkInt.h:
	* mac/tkMacBitmap.c:
	* mac/tkMacWm.c: added missing CONSTification

	* generic/tkIntDecls.h:
	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c: regen

1 files changed, 341 insertions, 118 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 5b3ca57..52673ea 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.29 2002/08/05 04:30:39 dgp Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.30 2002/08/31 06:12:20 das Exp $
 
 library tk
 
@@ -527,32 +527,32 @@ declare 112 generic {
     void TkpMenuThreadInit (void)
 }
 
-declare 113 {mac win}  {
+declare 113 {mac aqua win}  {
     void TkClipBox (TkRegion rgn, XRectangle* rect_return)
 }
 
-declare 114 {mac win}  {
+declare 114 {mac aqua win}  {
     TkRegion TkCreateRegion (void)
 }
 
-declare 115 {mac win} {
+declare 115 {mac aqua win} {
     void TkDestroyRegion (TkRegion rgn)
 }
 
-declare 116 {mac win} {
+declare 116 {mac aqua win} {
     void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
 
-declare 117 {mac win} {
+declare 117 {mac aqua win} {
     int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \
 	    unsigned int height)
 }
 
-declare 118 {mac win} {
+declare 118 {mac aqua win} {
     void TkSetRegion (Display* display, GC gc, TkRegion rgn)
 }
 
-declare 119 {mac win} {
+declare 119 {mac aqua win} {
     void TkUnionRectWithRegion (XRectangle* rect, \
 	    TkRegion src, TkRegion dr_return)
 }
@@ -562,11 +562,11 @@ declare 119 {mac win} {
 #    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
 #}
 
-declare 121 mac {
-    Pixmap TkpCreateNativeBitmap (Display *display, char * source)
+declare 121 {mac aqua} {
+    Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) 
 }
 
-declare 122 mac {
+declare 122 {mac aqua} {
     void TkpDefineNativeBitmaps (void)
 }
 
@@ -575,7 +575,7 @@ declare 122 mac {
 #    unsigned long TkpGetMS (void)
 #}
 
-declare 124 mac {
+declare 124 {mac aqua} {
     Pixmap TkpGetNativeAppBitmap (Display *display, \
  	    CONST char *name, int *width, int *height)
 }
@@ -657,7 +657,7 @@ declare 144 generic {
     void TkGCCleanup(TkDisplay *dispPtr)
 }
 
-declare 145 {mac win} {
+declare 145 {mac win aqua} {
     void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return)
 }
 
@@ -678,55 +678,55 @@ interface tkIntPlat
 #########################
 # Unix specific functions
 
-declare 0 unix {
+declare 0 x11 {
     void TkCreateXEventSource (void)
 }
 
-declare 1 unix {
+declare 1 x11 {
     void TkFreeWindowId (TkDisplay *dispPtr, Window w)
 }
 
-declare 2 unix {
+declare 2 x11 {
     void TkInitXId (TkDisplay *dispPtr)
 }
 
-declare 3 unix {
+declare 3 x11 {
     int TkpCmapStressed (Tk_Window tkwin, Colormap colormap)
 }
 
-declare 4 unix {
+declare 4 x11 {
     void TkpSync (Display *display)
 }
 
-declare 5 unix {
+declare 5 x11 {
     Window TkUnixContainerId (TkWindow *winPtr)
 }
 
-declare 6 unix {
+declare 6 x11 {
     int TkUnixDoOneXEvent (Tcl_Time *timePtr)
 }
 
-declare 7 unix {
+declare 7 x11 {
     void TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar)
 }
 
-declare 8 unix {
+declare 8 x11 {
     int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr)
 }
 
-declare 9 unix {
+declare 9 x11 {
     void TkWmCleanup (TkDisplay *dispPtr)
 }
 
-declare 10 unix {
+declare 10 x11 {
     void TkSendCleanup (TkDisplay *dispPtr)
 }
 
-declare 11 unix {
+declare 11 x11 {
     void TkFreeXId (TkDisplay *dispPtr)
 }
 
-declare 12 unix {
+declare 12 x11 {
     int TkpWmSetState (TkWindow *winPtr, int state)
 }
 
@@ -882,7 +882,7 @@ declare 0 mac {
 
 # removed duplicates from tkInt table
 #declare 1 mac {
-#    Pixmap TkpCreateNativeBitmap (Display *display, char * source)
+#    Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source)
 #}
 #
 #declare 2 mac {
@@ -1114,6 +1114,229 @@ declare 66 mac {
     int TkpIsWindowFloating (WindowRef window)
 }
 
+########################
+# Mac OS X specific functions
+
+declare 0 aqua {
+    void TkGenerateActivateEvents (TkWindow *winPtr, int active)
+}
+
+# removed duplicates from tkInt table
+#declare 1 aqua {
+#    Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source)
+#}
+#
+#declare 2 aqua {
+#    void TkpDefineNativeBitmaps (void)
+#}
+
+declare 3 aqua {
+    void TkPointerDeadWindow (TkWindow *winPtr)
+}
+
+declare 4 aqua {
+    void TkpSetCapture (TkWindow *winPtr)
+}
+
+declare 5 aqua {
+    void TkpSetCursor (TkpCursor cursor)
+}
+
+declare 6 aqua {
+    void TkpWmSetState (TkWindow *winPtr, int state)
+}
+
+declare 7 aqua {
+    void   TkAboutDlg (void)
+}
+
+declare 8 aqua {
+    unsigned int TkMacOSXButtonKeyState (void)
+}
+
+declare 9 aqua {
+    void  TkMacOSXClearMenubarActive (void)
+}
+
+declare 10 aqua {
+    int  TkMacOSXDispatchMenuEvent (int menuID, int index)
+}
+
+declare 11 aqua {
+    void  TkMacOSXInstallCursor (int resizeOverride)
+}
+
+declare 12 aqua {
+    void  TkMacOSXHandleTearoffMenu (void)
+}
+
+# removed duplicate from tkPlat table (tk.decls)
+#declare 13 aqua {
+#    void  TkMacOSXInvalClipRgns (TkWindow *winPtr)
+#}
+
+declare 14 aqua {
+    int  TkMacOSXDoHLEvent (EventRecord *theEvent)
+}
+
+# removed duplicate from tkPlat table (tk.decls)
+#declare 15 aqua {
+#    GWorldPtr  TkMacOSXGetDrawablePort (Drawable drawable)
+#}
+
+declare 16 aqua {
+    Window   TkMacOSXGetXWindow (WindowRef macWinPtr)
+}
+
+declare 17 aqua {
+    int  TkMacOSXGrowToplevel (WindowRef whichWindow, Point start)
+}
+
+declare 18 aqua {
+    void   TkMacOSXHandleMenuSelect (long mResult, int optionKeyPressed)
+}
+
+# removed duplicates from tkPlat table (tk.decls)
+#declare 19 aqua {
+#    void  TkMacOSXInitAppleEvents (Tcl_Interp *interp)
+#}
+#
+#declare 20 aqua {
+#    void   TkMacOSXInitMenus (Tcl_Interp  *interp)
+#}
+
+declare 21 aqua {
+    void  TkMacOSXInvalidateWindow (MacDrawable *macWin, int flag)
+}
+
+declare 22 aqua {
+    int  TkMacOSXIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar)
+}
+
+declare 23 aqua {
+    void  TkMacOSXMakeRealWindowExist (TkWindow *winPtr)
+}
+
+declare 24 aqua {
+    BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2)
+}
+
+declare 25 aqua {
+    void  TkMacOSXMenuClick (void)
+}
+
+declare 26 aqua {
+    void  TkMacOSXRegisterOffScreenWindow (Window window, GWorldPtr portPtr)
+}
+
+declare 27 aqua {
+    int  TkMacOSXResizable (TkWindow *winPtr)
+}
+
+declare 28 aqua {
+    void  TkMacOSXSetHelpMenuItemCount (void)
+}
+
+declare 29 aqua {
+    void  TkMacOSXSetScrollbarGrow (TkWindow *winPtr, int flag)
+}
+
+declare 30 aqua {
+    void  TkMacOSXSetUpClippingRgn (Drawable drawable)
+}
+
+declare 31 aqua {
+    void  TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort)
+}
+
+declare 32 aqua {
+    void   TkMacOSXUpdateClipRgn (TkWindow *winPtr)
+}
+
+declare 33 aqua {
+    void  TkMacOSXUnregisterMacWindow (WindowRef portPtr)
+}
+
+declare 34 aqua {
+    int  TkMacOSXUseMenuID (short macID)
+}
+
+declare 35 aqua {
+    RgnHandle  TkMacOSXVisableClipRgn (TkWindow *winPtr)
+}
+
+declare 36 aqua {
+    void  TkMacOSXWinBounds (TkWindow *winPtr, Rect *geometry)
+}
+
+declare 37 aqua {
+    void  TkMacOSXWindowOffset (WindowRef wRef, int *xOffset, int *yOffset)
+}
+
+declare 38 aqua {
+    int   TkSetMacColor (unsigned long pixel, RGBColor *macColor)
+}
+
+declare 39 aqua {
+    void   TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid)
+}
+
+declare 40 aqua {
+    void  TkSuspendClipboard (void)
+}
+
+declare 41 aqua {
+    int  TkMacOSXZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart)
+}
+
+declare 42 aqua {
+    Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \
+	    int rootX, int rootY, int *newX, int *newY)
+}
+
+declare 43 aqua {
+    MacDrawable * TkMacOSXContainerId (TkWindow *winPtr)
+}
+
+declare 44 aqua {
+    MacDrawable * TkMacOSXGetHostToplevel  (TkWindow *winPtr)
+}
+
+declare 45 aqua {
+    void TkMacOSXPreprocessMenu (void)
+}
+
+declare 46 aqua {
+    int  TkpIsWindowFloating (WindowRef window)
+}
+
+declare 47 aqua {
+    Tk_Window TkMacOSXGetCapture (void)
+}
+
+declare 49 aqua {
+    Window  TkGetTransientMaster (TkWindow *winPtr)
+}
+
+declare 50 aqua {
+    int  TkGenerateButtonEvent (int x, int y, \
+ 	    Window window, unsigned int state)
+}
+
+declare 51 aqua {
+    void  TkGenWMDestroyEvent (Tk_Window tkwin)
+}
+
+# removed duplicate from tkPlat table (tk.decls)
+#declare 52 aqua {
+#    void  TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \
+# 	    int width, int height, int flags)
+#}
+
+declare 53 aqua {
+    unsigned long TkpGetMS (void)
+}
+
 ##############################################################################
 
 # Define the platform specific internal Xlib interfaces. These functions are
@@ -1603,409 +1826,409 @@ declare 105 win {
 	    unsigned int sw, unsigned int sh, int dx, int dy)
 }
 
-# X functions for Mac
+# X functions for Mac and Aqua
 
-declare 0 mac {
+declare 0 {mac aqua} {
     void XSetDashes (Display* display, GC gc, int dash_offset,
 	    _Xconst char* dash_list, int n)
 }
 
-declare 1 mac {
+declare 1 {mac aqua} {
     XModifierKeymap* XGetModifierMapping (Display* d)
 }
 
-declare 2 mac {
+declare 2 {mac aqua} {
     XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \
 	    int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \
 	    int i4)
 
 }
 
-declare 3 mac {
+declare 3 {mac aqua} {
     XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)
 }
 
-declare 4 mac {
+declare 4 {mac aqua} {
     char *XGetAtomName (Display* d,Atom a)
 
 }
 
-declare 5 mac {
+declare 5 {mac aqua} {
     char *XKeysymToString (KeySym k)
 }
 
-declare 6 mac {
+declare 6 {mac aqua} {
     Colormap XCreateColormap (Display* d, Window w, Visual* v, int i)
 
 }
 
-declare 7 mac {
+declare 7 {mac aqua} {
     GContext XGContextFromGC (GC g)
 }
 
-declare 8 mac {
+declare 8 {mac aqua} {
     KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i)
 }
 
-declare 9 mac {
+declare 9 {mac aqua} {
     KeySym XStringToKeysym (_Xconst char* c)
 }
 
-declare 10 mac {
+declare 10 {mac aqua} {
     Window XRootWindow (Display* d, int i)
 }
 
-declare 11 mac {
+declare 11 {mac aqua} {
     XErrorHandler XSetErrorHandler  (XErrorHandler x)
 }
 
-declare 12 mac {
+declare 12 {mac aqua} {
     Status XAllocColor (Display* d, Colormap c, XColor* xp)
 }
 
-declare 13 mac {
+declare 13 {mac aqua} {
     void XBell (Display* d, int i)
 }
 
-declare 14 mac {
+declare 14 {mac aqua} {
     void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \
 	    int i2, _Xconst unsigned char* c, int i3)
 }
 
-declare 15 mac {
+declare 15 {mac aqua} {
     void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \
 	    XSetWindowAttributes* x)
 }
 
-declare 16 mac {
+declare 16 {mac aqua} {
     void XConfigureWindow (Display* d, Window w, unsigned int i, \
 	    XWindowChanges* x)
 }
 
-declare 17 mac {
+declare 17 {mac aqua} {
     void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4)
 }
 
-declare 18 mac {
+declare 18 {mac aqua} {
     void XCopyPlane (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \
 	    int i2, unsigned int ui1, \
 	    unsigned int ui2, int i3, int i4, unsigned long ul)
 }
 
-declare 19 mac {
+declare 19 {mac aqua} {
     Pixmap XCreateBitmapFromData(Display* display, Drawable d, \
 	    _Xconst char* data, unsigned int width,unsigned int height)
 }
 
-declare 20 mac {
+declare 20 {mac aqua} {
     void XDefineCursor (Display* d, Window w, Cursor c)
 }
 
-declare 21 mac {
+declare 21 {mac aqua} {
     void XDestroyWindow (Display* d, Window w)
 }
 
-declare 22 mac {
+declare 22 {mac aqua} {
     void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 23 mac {
+declare 23 {mac aqua} {
     void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
 }
 
-declare 24 mac {
+declare 24 {mac aqua} {
     void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 25 mac {
+declare 25 {mac aqua} {
     void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2, int i3, int i4)
 }
 
-declare 26 mac {
+declare 26 {mac aqua} {
     void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
 	    int i1, int i2, int i3)
 }
 
-declare 27 mac {
+declare 27 {mac aqua} {
     void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
 }
 
-declare 28 mac {
+declare 28 {mac aqua} {
     void XFreeColormap (Display* d, Colormap c)
 }
 
-declare 29 mac {
+declare 29 {mac aqua} {
     void XFreeColors (Display* d, Colormap c, \
 	    unsigned long* ulp, int i, unsigned long ul)
 }
 
-declare 30 mac {
+declare 30 {mac aqua} {
     void XFreeModifiermap (XModifierKeymap* x)
 }
 
-declare 31 mac {
+declare 31 {mac aqua} {
     Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \
 	    int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \
 	    unsigned int* ui4)
 }
 
-declare 32 mac {
+declare 32 {mac aqua} {
     int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \
 	    Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \
 	    unsigned long* ulp2, unsigned char** cpp)
 }
 
-declare 33 mac {
+declare 33 {mac aqua} {
     int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
 }
 
-declare 34 mac {
+declare 34 {mac aqua} {
     int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \
 	    int i1, int i2, Window w2, Cursor c, Time t)
 }
 
-declare 35 mac {
+declare 35 {mac aqua} {
     KeyCode XKeysymToKeycode (Display* d, KeySym k)
 }
 
-declare 36 mac {
+declare 36 {mac aqua} {
     void XMapWindow (Display* d, Window w)
 }
 
-declare 37 mac {
+declare 37 {mac aqua} {
     void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
 	    unsigned int ui1, unsigned int ui2)
 }
 
-declare 38 mac {
+declare 38 {mac aqua} {
     void XMoveWindow (Display* d, Window w, int i1, int i2)
 }
 
-declare 39 mac {
+declare 39 {mac aqua} {
     Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \
 	    int* i1, int* i2, int* i3, int* i4, unsigned int* ui)
 }
 
-declare 40 mac {
+declare 40 {mac aqua} {
     void XRaiseWindow (Display* d, Window w)
 }
 
-declare 41 mac {
+declare 41 {mac aqua} {
     void XRefreshKeyboardMapping (XMappingEvent* x)
 }
 
-declare 42 mac {
+declare 42 {mac aqua} {
     void XResizeWindow (Display* d, Window w, unsigned int ui1, \
 	    unsigned int ui2)
 }
 
-declare 43 mac {
+declare 43 {mac aqua} {
     void XSelectInput (Display* d, Window w, long l)
 }
 
-declare 44 mac {
+declare 44 {mac aqua} {
     Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
 }
 
-declare 45 mac {
+declare 45 {mac aqua} {
     void XSetIconName (Display* d, Window w, _Xconst char* c)
 }
 
-declare 46 mac {
+declare 46 {mac aqua} {
     void XSetInputFocus (Display* d, Window w, int i, Time t)
 }
 
-declare 47 mac {
+declare 47 {mac aqua} {
     void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
 }
 
-declare 48 mac {
+declare 48 {mac aqua} {
     void XSetWindowBackground (Display* d, Window w, unsigned long ul)
 }
 
-declare 49 mac {
+declare 49 {mac aqua} {
     void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 50 mac {
+declare 50 {mac aqua} {
     void XSetWindowBorder (Display* d, Window w, unsigned long ul)
 }
 
-declare 51 mac {
+declare 51 {mac aqua} {
     void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
 }
 
-declare 52 mac {
+declare 52 {mac aqua} {
     void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
 }
 
-declare 53 mac {
+declare 53 {mac aqua} {
     void XSetWindowColormap (Display* d, Window w, Colormap c)
 }
 
-declare 54 mac {
+declare 54 {mac aqua} {
     void XUngrabKeyboard (Display* d, Time t)
 }
 
-declare 55 mac {
+declare 55 {mac aqua} {
     void XUngrabPointer (Display* d, Time t) 
 }
 
-declare 56 mac {
+declare 56 {mac aqua} {
     void XUnmapWindow (Display* d, Window w)
 }
 
-declare 57 mac {
+declare 57 {mac aqua} {
     void TkPutImage (unsigned long *colors, \
 	    int ncolors, Display* display, Drawable d, \
 	    GC gc, XImage* image, int src_x, int src_y, \
 	    int dest_x, int dest_y, unsigned int width, \
 	    unsigned int height)
 } 
-declare 58 mac {
+declare 58 {mac aqua} {
     Status XParseColor (Display *display, Colormap map, \
           _Xconst char* spec, XColor *colorPtr)
 }
 
-declare 59 mac {
+declare 59 {mac aqua} {
     GC XCreateGC(Display* display, Drawable d, \
 	    unsigned long valuemask, XGCValues* values)
 }
 
-declare 60 mac {
+declare 60 {mac aqua} {
     void XFreeGC(Display* display, GC gc)
 }
 
-declare 61 mac {
+declare 61 {mac aqua} {
     Atom XInternAtom(Display* display,_Xconst char* atom_name, \
 	    Bool only_if_exists)
 }
 
-declare 62 mac {
+declare 62 {mac aqua} {
     void XSetBackground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 63 mac {
+declare 63 {mac aqua} {
     void XSetForeground(Display* display, GC gc, \
 	    unsigned long foreground)
 }
 
-declare 64 mac {
+declare 64 {mac aqua} {
     void XSetClipMask(Display* display, GC gc, Pixmap pixmap)
 }
 
-declare 65 mac {
+declare 65 {mac aqua} {
     void XSetClipOrigin(Display* display, GC gc, \
 	    int clip_x_origin, int clip_y_origin)
 }
 
-declare 66 mac {
+declare 66 {mac aqua} {
     void XSetTSOrigin(Display* display, GC gc, \
 	    int ts_x_origin, int ts_y_origin)
 }
 
-declare 67 mac {
+declare 67 {mac aqua} {
     void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values)
 }
 
-declare 68 mac {
+declare 68 {mac aqua} {
     void XSetFont(Display *display, GC gc, Font font)
 }
 
-declare 69 mac {
+declare 69 {mac aqua} {
     void XSetArcMode(Display *display, GC gc, int arc_mode)
 }
 
-declare 70 mac {
+declare 70 {mac aqua} {
     void XSetStipple(Display *display, GC gc, Pixmap stipple)
 }
 
-declare 71 mac {
+declare 71 {mac aqua} {
     void XSetFillRule(Display *display, GC gc, int fill_rule)
 }
 
-declare 72 mac {
+declare 72 {mac aqua} {
     void XSetFillStyle(Display *display, GC gc, int fill_style)
 }
 
-declare 73 mac {
+declare 73 {mac aqua} {
     void XSetFunction(Display *display, GC gc, int function)
 }
 
-declare 74 mac {
+declare 74 {mac aqua} {
     void XSetLineAttributes(Display *display, GC gc, \
 	    unsigned int line_width, int line_style, \
 	    int cap_style, int join_style)
 }
 
-declare 75 mac {
+declare 75 {mac aqua} {
     int _XInitImageFuncPtrs(XImage *image)
 }
 
-declare 76 mac {
+declare 76 {mac aqua} {
     XIC XCreateIC(void)
 }
 
-declare 77 mac {
+declare 77 {mac aqua} {
     XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \
 	    XVisualInfo* vinfo_template, int* nitems_return)
 }
 
-declare 78 mac {
+declare 78 {mac aqua} {
     void XSetWMClientMachine(Display* display, Window w, \
 	    XTextProperty* text_prop)
 }
 
-declare 79 mac {
+declare 79 {mac aqua} {
     Status XStringListToTextProperty(char** list, int count, \
 	    XTextProperty* text_prop_return)
 }
-declare 80 mac {
+declare 80 {mac aqua} {
     void XDrawSegments(Display *display, Drawable  d, GC gc, \
 	    XSegment *segments, int  nsegments)
 }
-declare 81 mac {
+declare 81 {mac aqua} {
     void  XForceScreenSaver(Display* display, int mode)
 }
-declare 82 mac {
+declare 82 {mac aqua} {
     void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \
 	    int x2, int y2)
 }
-declare 83 mac {
+declare 83 {mac aqua} {
     void XFillRectangle (Display* display, Drawable d, GC gc, \
 	    int x, int y, unsigned int width, unsigned int height)
 }
-declare 84 mac {
+declare 84 {mac aqua} {
     void XClearWindow (Display* d, Window w)
 }
 
-declare 85 mac {
+declare 85 {mac aqua} {
     void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y)
 }
 
-declare 86 mac {
+declare 86 {mac aqua} {
     void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \
 	    int npoints, int mode)
 }
 
-declare 87 mac {
+declare 87 {mac aqua} {
     void XWarpPointer (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)
 }
 
-declare 88 mac {
+declare 88 {mac aqua} {
     void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out)
 }
 
-declare 89 mac {
+declare 89 {mac aqua} {
     void XQueryColors (Display *display, Colormap colormap, \
 	    XColor *defs_in_out, int ncolors)
 }