Letting CONST die a slow and graceful death, since NO_CONST was

broken since 8.4 and no-one complained about it.

1 files changed, 184 insertions, 184 deletions

diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 0a7974a..b6a3b8b 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.26 2008/04/08 15:00:47 das Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.27 2008/10/22 20:56:43 nijtmans Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -38,8 +38,8 @@
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc, 
-				int dash_offset, _Xconst char * dash_list, 
+EXTERN void		XSetDashes (Display * display, GC gc,
+				int dash_offset, _Xconst char * dash_list,
 				int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
@@ -50,16 +50,16 @@ EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v, 
-				unsigned int ui1, int i1, int i2, char * cp, 
-				unsigned int ui2, unsigned int ui3, int i3, 
+EXTERN 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);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
@@ -75,21 +75,21 @@ EXTERN char *		XKeysymToString (KeySym k);
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v, 
+EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
 				int i);
 #endif
 #ifndef XCreatePixmapCursor_TCL_DECLARED
 #define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
-EXTERN Cursor		XCreatePixmapCursor (Display * d, Pixmap p1, 
-				Pixmap p2, XColor * x1, XColor * x2, 
+EXTERN Cursor		XCreatePixmapCursor (Display * d, Pixmap p1,
+				Pixmap p2, XColor * x1, XColor * x2,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XCreateGlyphCursor_TCL_DECLARED
 #define XCreateGlyphCursor_TCL_DECLARED
 /* 8 */
-EXTERN Cursor		XCreateGlyphCursor (Display * d, Font f1, Font f2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN Cursor		XCreateGlyphCursor (Display * d, Font f1, Font f2,
+				unsigned int ui1, unsigned int ui2,
 				XColor * x1, XColor * x2);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
@@ -135,7 +135,7 @@ EXTERN Status		XWithdrawWindow (Display * d, Window w, int i);
 #ifndef XGetWMColormapWindows_TCL_DECLARED
 #define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
-EXTERN Status		XGetWMColormapWindows (Display * d, Window w, 
+EXTERN Status		XGetWMColormapWindows (Display * d, Window w,
 				Window ** wpp, int * ip);
 #endif
 #ifndef XAllocColor_TCL_DECLARED
@@ -151,14 +151,14 @@ EXTERN void		XBell (Display * d, int i);
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 20 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1, 
-				Atom a2, int i1, int i2, 
+EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
 				_Xconst unsigned char * c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 21 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w, 
+EXTERN void		XChangeWindowAttributes (Display * d, Window w,
 				unsigned long ul, XSetWindowAttributes * x);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
@@ -169,29 +169,29 @@ EXTERN void		XClearWindow (Display * d, Window w);
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 23 */
-EXTERN void		XConfigureWindow (Display * d, Window w, 
+EXTERN void		XConfigureWindow (Display * d, Window w,
 				unsigned int i, XWindowChanges * x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 24 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
+EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 25 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4, 
+EXTERN 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);
 #endif
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d, 
-				_Xconst char * data, unsigned int width, 
+EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
+				_Xconst char * data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
@@ -212,40 +212,40 @@ EXTERN void		XDestroyWindow (Display * d, Window w);
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 30 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 31 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g, 
+EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 32 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
+EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
+				int i1, int i2, unsigned int ui1,
 				unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 33 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 34 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 35 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
 				XRectangle * x, int i);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
@@ -261,7 +261,7 @@ EXTERN void		XFreeColormap (Display * d, Colormap c);
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 38 */
-EXTERN void		XFreeColors (Display * d, Colormap c, 
+EXTERN void		XFreeColors (Display * d, Colormap c,
 				unsigned long * ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeCursor_TCL_DECLARED
@@ -277,9 +277,9 @@ EXTERN void		XFreeModifiermap (XModifierKeymap * x);
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 41 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w, 
-				int * i1, int * i2, unsigned int * ui1, 
-				unsigned int * ui2, unsigned int * ui3, 
+EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
+				int * i1, int * i2, unsigned int * ui1,
+				unsigned int * ui2, unsigned int * ui3,
 				unsigned int * ui4);
 #endif
 #ifndef XGetInputFocus_TCL_DECLARED
@@ -290,28 +290,28 @@ EXTERN void		XGetInputFocus (Display * d, Window * w, int * i);
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 43 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1, 
-				long l1, long l2, Bool b, Atom a2, Atom * ap, 
-				int * ip, unsigned long * ulp1, 
+EXTERN 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);
 #endif
 #ifndef XGetWindowAttributes_TCL_DECLARED
 #define XGetWindowAttributes_TCL_DECLARED
 /* 44 */
-EXTERN Status		XGetWindowAttributes (Display * d, Window w, 
+EXTERN Status		XGetWindowAttributes (Display * d, Window w,
 				XWindowAttributes * x);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 45 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1, 
+EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 46 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b, 
-				unsigned int ui, int i1, int i2, Window w2, 
+EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
@@ -322,7 +322,7 @@ EXTERN KeyCode		XKeysymToKeycode (Display * d, KeySym k);
 #ifndef XLookupColor_TCL_DECLARED
 #define XLookupColor_TCL_DECLARED
 /* 48 */
-EXTERN Status		XLookupColor (Display * d, Colormap c1, 
+EXTERN Status		XLookupColor (Display * d, Colormap c1,
 				_Xconst char * c2, XColor * x1, XColor * x2);
 #endif
 #ifndef XMapWindow_TCL_DECLARED
@@ -333,7 +333,7 @@ EXTERN void		XMapWindow (Display * d, Window w);
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1, 
+EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
@@ -354,20 +354,20 @@ EXTERN void		XPutBackEvent (Display * d, XEvent * x);
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 54 */
-EXTERN void		XQueryColors (Display * d, Colormap c, XColor * x, 
+EXTERN void		XQueryColors (Display * d, Colormap c, XColor * x,
 				int i);
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 55 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2, 
-				Window * w3, int * i1, int * i2, int * i3, 
+EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
+				Window * w3, int * i1, int * i2, int * i3,
 				int * i4, unsigned int * ui);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 56 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2, 
+EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
 				Window * w3, Window ** w4, unsigned int * ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
@@ -383,7 +383,7 @@ EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 59 */
-EXTERN void		XResizeWindow (Display * d, Window w, 
+EXTERN void		XResizeWindow (Display * d, Window w,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
@@ -394,19 +394,19 @@ EXTERN void		XSelectInput (Display * d, Window w, long l);
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 61 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l, 
+EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
 				XEvent * x);
 #endif
 #ifndef XSetCommand_TCL_DECLARED
 #define XSetCommand_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetCommand (Display * d, Window w, CONST char ** c, 
+EXTERN void		XSetCommand (Display * d, Window w, const char ** c,
 				int i);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetIconName (Display * d, Window w, 
+EXTERN void		XSetIconName (Display * d, Window w,
 				_Xconst char * c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
@@ -417,50 +417,50 @@ EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w, 
+EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetWindowBackground (Display * d, Window w, 
+EXTERN void		XSetWindowBackground (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 68 */
-EXTERN void		XSetWindowBorder (Display * d, Window w, 
+EXTERN void		XSetWindowBorder (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w, 
+EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetWindowColormap (Display * d, Window w, 
+EXTERN void		XSetWindowColormap (Display * d, Window w,
 				Colormap c);
 #endif
 #ifndef XTranslateCoordinates_TCL_DECLARED
 #define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
-EXTERN Bool		XTranslateCoordinates (Display * d, Window w1, 
-				Window w2, int i1, int i2, int * i3, 
+EXTERN Bool		XTranslateCoordinates (Display * d, Window w1,
+				Window w2, int i1, int i2, int * i3,
 				int * i4, Window * w3);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
@@ -481,7 +481,7 @@ EXTERN void		XUnmapWindow (Display * d, Window w);
 #ifndef XWindowEvent_TCL_DECLARED
 #define XWindowEvent_TCL_DECLARED
 /* 76 */
-EXTERN void		XWindowEvent (Display * d, Window w, long l, 
+EXTERN void		XWindowEvent (Display * d, Window w, long l,
 				XEvent * x);
 #endif
 #ifndef XDestroyIC_TCL_DECLARED
@@ -497,29 +497,29 @@ EXTERN Bool		XFilterEvent (XEvent * x, Window w);
 #ifndef XmbLookupString_TCL_DECLARED
 #define XmbLookupString_TCL_DECLARED
 /* 79 */
-EXTERN int		XmbLookupString (XIC xi, XKeyPressedEvent * xk, 
+EXTERN int		XmbLookupString (XIC xi, XKeyPressedEvent * xk,
 				char * c, int i, KeySym * k, Status * s);
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 80 */
-EXTERN 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, 
+EXTERN 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);
 #endif
 /* Slot 81 is reserved */
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 82 */
-EXTERN Status		XParseColor (Display * display, Colormap map, 
+EXTERN Status		XParseColor (Display * display, Colormap map,
 				_Xconst char * spec, XColor * colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 83 */
-EXTERN GC		XCreateGC (Display * display, Drawable d, 
+EXTERN GC		XCreateGC (Display * display, Drawable d,
 				unsigned long valuemask, XGCValues * values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
@@ -530,44 +530,44 @@ EXTERN void		XFreeGC (Display * display, GC gc);
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 85 */
-EXTERN Atom		XInternAtom (Display * display, 
-				_Xconst char * atom_name, 
+EXTERN Atom		XInternAtom (Display * display,
+				_Xconst char * atom_name,
 				Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 86 */
-EXTERN void		XSetBackground (Display * display, GC gc, 
+EXTERN void		XSetBackground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 87 */
-EXTERN void		XSetForeground (Display * display, GC gc, 
+EXTERN void		XSetForeground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 88 */
-EXTERN void		XSetClipMask (Display * display, GC gc, 
+EXTERN void		XSetClipMask (Display * display, GC gc,
 				Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 89 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc, 
+EXTERN void		XSetClipOrigin (Display * display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 90 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc, 
+EXTERN void		XSetTSOrigin (Display * display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 91 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask, 
+EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
 				XGCValues * values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
@@ -583,19 +583,19 @@ EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 94 */
-EXTERN void		XSetStipple (Display * display, GC gc, 
+EXTERN void		XSetStipple (Display * display, GC gc,
 				Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 95 */
-EXTERN void		XSetFillRule (Display * display, GC gc, 
+EXTERN void		XSetFillRule (Display * display, GC gc,
 				int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 96 */
-EXTERN void		XSetFillStyle (Display * display, GC gc, 
+EXTERN void		XSetFillStyle (Display * display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
@@ -606,8 +606,8 @@ EXTERN void		XSetFunction (Display * display, GC gc, int function);
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 98 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc, 
-				unsigned int line_width, int line_style, 
+EXTERN void		XSetLineAttributes (Display * display, GC gc,
+				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
@@ -623,40 +623,40 @@ EXTERN XIC		XCreateIC (void);
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 101 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask, 
-				XVisualInfo * vinfo_template, 
+EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
+				XVisualInfo * vinfo_template,
 				int * nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w, 
+EXTERN void		XSetWMClientMachine (Display * display, Window w,
 				XTextProperty * text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count, 
+EXTERN Status		XStringListToTextProperty (char ** list, int count,
 				XTextProperty * text_prop_return);
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 104 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1, 
+EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 105 */
-EXTERN void		XWarpPointer (Display * d, Window s, Window dw, 
-				int sx, int sy, unsigned int sw, 
+EXTERN void		XWarpPointer (Display * d, Window s, Window dw,
+				int sx, int sy, unsigned int sw,
 				unsigned int sh, int dx, int dy);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 106 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc, 
-				int x, int y, unsigned int width, 
+EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
 #endif /* WIN */
@@ -664,8 +664,8 @@ EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc, 
-				int dash_offset, _Xconst char * dash_list, 
+EXTERN void		XSetDashes (Display * display, GC gc,
+				int dash_offset, _Xconst char * dash_list,
 				int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
@@ -676,16 +676,16 @@ EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v, 
-				unsigned int ui1, int i1, int i2, char * cp, 
-				unsigned int ui2, unsigned int ui3, int i3, 
+EXTERN 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);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2, 
-				unsigned int ui1, unsigned int ui2, 
+EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
@@ -701,7 +701,7 @@ EXTERN char *		XKeysymToString (KeySym k);
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v, 
+EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
 				int i);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
@@ -742,42 +742,42 @@ EXTERN void		XBell (Display * d, int i);
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 14 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1, 
-				Atom a2, int i1, int i2, 
+EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+				Atom a2, int i1, int i2,
 				_Xconst unsigned char * c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 15 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w, 
+EXTERN void		XChangeWindowAttributes (Display * d, Window w,
 				unsigned long ul, XSetWindowAttributes * x);
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 16 */
-EXTERN void		XConfigureWindow (Display * d, Window w, 
+EXTERN void		XConfigureWindow (Display * d, Window w,
 				unsigned int i, XWindowChanges * x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 17 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
+EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 18 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2, 
-				GC g, int i1, int i2, unsigned int ui1, 
-				unsigned int ui2, int i3, int i4, 
+EXTERN 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);
 #endif
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d, 
-				_Xconst char * data, unsigned int width, 
+EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
+				_Xconst char * data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
@@ -793,40 +793,40 @@ EXTERN void		XDestroyWindow (Display * d, Window w);
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 22 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 23 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g, 
+EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 24 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g, 
-				int i1, int i2, unsigned int ui1, 
+EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
+				int i1, int i2, unsigned int ui1,
 				unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 25 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1, 
-				int i2, unsigned int ui1, unsigned int ui2, 
+EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 26 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
 				XPoint * x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 27 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g, 
+EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
 				XRectangle * x, int i);
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
@@ -837,7 +837,7 @@ EXTERN void		XFreeColormap (Display * d, Colormap c);
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 29 */
-EXTERN void		XFreeColors (Display * d, Colormap c, 
+EXTERN void		XFreeColors (Display * d, Colormap c,
 				unsigned long * ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeModifiermap_TCL_DECLARED
@@ -848,30 +848,30 @@ EXTERN void		XFreeModifiermap (XModifierKeymap * x);
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 31 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w, 
-				int * i1, int * i2, unsigned int * ui1, 
-				unsigned int * ui2, unsigned int * ui3, 
+EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
+				int * i1, int * i2, unsigned int * ui1,
+				unsigned int * ui2, unsigned int * ui3,
 				unsigned int * ui4);
 #endif
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 32 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1, 
-				long l1, long l2, Bool b, Atom a2, Atom * ap, 
-				int * ip, unsigned long * ulp1, 
+EXTERN 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);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 33 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1, 
+EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 34 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b, 
-				unsigned int ui, int i1, int i2, Window w2, 
+EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
@@ -887,7 +887,7 @@ EXTERN void		XMapWindow (Display * d, Window w);
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1, 
+EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
@@ -898,8 +898,8 @@ EXTERN void		XMoveWindow (Display * d, Window w, int i1, int i2);
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 39 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2, 
-				Window * w3, int * i1, int * i2, int * i3, 
+EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
+				Window * w3, int * i1, int * i2, int * i3,
 				int * i4, unsigned int * ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
@@ -915,7 +915,7 @@ EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 42 */
-EXTERN void		XResizeWindow (Display * d, Window w, 
+EXTERN void		XResizeWindow (Display * d, Window w,
 				unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
@@ -926,13 +926,13 @@ EXTERN void		XSelectInput (Display * d, Window w, long l);
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 44 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l, 
+EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
 				XEvent * x);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 45 */
-EXTERN void		XSetIconName (Display * d, Window w, 
+EXTERN void		XSetIconName (Display * d, Window w,
 				_Xconst char * c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
@@ -943,43 +943,43 @@ EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w, 
+EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 48 */
-EXTERN void		XSetWindowBackground (Display * d, Window w, 
+EXTERN void		XSetWindowBackground (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 50 */
-EXTERN void		XSetWindowBorder (Display * d, Window w, 
+EXTERN void		XSetWindowBorder (Display * d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w, 
+EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w, 
+EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 53 */
-EXTERN void		XSetWindowColormap (Display * d, Window w, 
+EXTERN void		XSetWindowColormap (Display * d, Window w,
 				Colormap c);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
@@ -1000,22 +1000,22 @@ EXTERN void		XUnmapWindow (Display * d, Window w);
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 57 */
-EXTERN 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, 
+EXTERN 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);
 #endif
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 58 */
-EXTERN Status		XParseColor (Display * display, Colormap map, 
+EXTERN Status		XParseColor (Display * display, Colormap map,
 				_Xconst char * spec, XColor * colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 59 */
-EXTERN GC		XCreateGC (Display * display, Drawable d, 
+EXTERN GC		XCreateGC (Display * display, Drawable d,
 				unsigned long valuemask, XGCValues * values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
@@ -1026,44 +1026,44 @@ EXTERN void		XFreeGC (Display * display, GC gc);
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 61 */
-EXTERN Atom		XInternAtom (Display * display, 
-				_Xconst char * atom_name, 
+EXTERN Atom		XInternAtom (Display * display,
+				_Xconst char * atom_name,
 				Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetBackground (Display * display, GC gc, 
+EXTERN void		XSetBackground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetForeground (Display * display, GC gc, 
+EXTERN void		XSetForeground (Display * display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetClipMask (Display * display, GC gc, 
+EXTERN void		XSetClipMask (Display * display, GC gc,
 				Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc, 
+EXTERN void		XSetClipOrigin (Display * display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc, 
+EXTERN void		XSetTSOrigin (Display * display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 67 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask, 
+EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
 				XGCValues * values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
@@ -1079,19 +1079,19 @@ EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetStipple (Display * display, GC gc, 
+EXTERN void		XSetStipple (Display * display, GC gc,
 				Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetFillRule (Display * display, GC gc, 
+EXTERN void		XSetFillRule (Display * display, GC gc,
 				int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 72 */
-EXTERN void		XSetFillStyle (Display * display, GC gc, 
+EXTERN void		XSetFillStyle (Display * display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
@@ -1102,8 +1102,8 @@ EXTERN void		XSetFunction (Display * display, GC gc, int function);
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 74 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc, 
-				unsigned int line_width, int line_style, 
+EXTERN void		XSetLineAttributes (Display * display, GC gc,
+				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
@@ -1119,26 +1119,26 @@ EXTERN XIC		XCreateIC (void);
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask, 
-				XVisualInfo * vinfo_template, 
+EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
+				XVisualInfo * vinfo_template,
 				int * nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w, 
+EXTERN void		XSetWMClientMachine (Display * display, Window w,
 				XTextProperty * text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count, 
+EXTERN Status		XStringListToTextProperty (char ** list, int count,
 				XTextProperty * text_prop_return);
 #endif
 #ifndef XDrawSegments_TCL_DECLARED
 #define XDrawSegments_TCL_DECLARED
 /* 80 */
-EXTERN void		XDrawSegments (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawSegments (Display * display, Drawable d, GC gc,
 				XSegment * segments, int nsegments);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
@@ -1149,14 +1149,14 @@ EXTERN void		XForceScreenSaver (Display * display, int mode);
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 82 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1, 
+EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 83 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc, 
-				int x, int y, unsigned int width, 
+EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
@@ -1167,40 +1167,40 @@ EXTERN void		XClearWindow (Display * d, Window w);
 #ifndef XDrawPoint_TCL_DECLARED
 #define XDrawPoint_TCL_DECLARED
 /* 85 */
-EXTERN void		XDrawPoint (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawPoint (Display * display, Drawable d, GC gc,
 				int x, int y);
 #endif
 #ifndef XDrawPoints_TCL_DECLARED
 #define XDrawPoints_TCL_DECLARED
 /* 86 */
-EXTERN void		XDrawPoints (Display * display, Drawable d, GC gc, 
+EXTERN void		XDrawPoints (Display * display, Drawable d, GC gc,
 				XPoint * points, int npoints, int mode);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 87 */
-EXTERN 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, 
+EXTERN 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);
 #endif
 #ifndef XQueryColor_TCL_DECLARED
 #define XQueryColor_TCL_DECLARED
 /* 88 */
-EXTERN void		XQueryColor (Display * display, Colormap colormap, 
+EXTERN void		XQueryColor (Display * display, Colormap colormap,
 				XColor * def_in_out);
 #endif
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 89 */
-EXTERN void		XQueryColors (Display * display, Colormap colormap, 
+EXTERN void		XQueryColors (Display * display, Colormap colormap,
 				XColor * defs_in_out, int ncolors);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 90 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2, 
+EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
 				Window * w3, Window ** w4, unsigned int * ui);
 #endif
 #ifndef XSync_TCL_DECLARED
@@ -1212,7 +1212,7 @@ EXTERN int		XSync (Display * display, Bool flag);
 
 typedef struct TkIntXlibStubs {
     int magic;
-    CONST struct TkIntXlibStubHooks *hooks;
+    const struct TkIntXlibStubHooks *hooks;
 
 #ifdef __WIN32__ /* WIN */
     void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */
@@ -1277,7 +1277,7 @@ typedef struct TkIntXlibStubs {
     void (*xResizeWindow) (Display * d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
     void (*xSelectInput) (Display * d, Window w, long l); /* 60 */
     Status (*xSendEvent) (Display * d, Window w, Bool b, long l, XEvent * x); /* 61 */
-    void (*xSetCommand) (Display * d, Window w, CONST char ** c, int i); /* 62 */
+    void (*xSetCommand) (Display * d, Window w, const char ** c, int i); /* 62 */
     void (*xSetIconName) (Display * d, Window w, _Xconst char * c); /* 63 */
     void (*xSetInputFocus) (Display * d, Window w, int i, Time t); /* 64 */
     void (*xSetSelectionOwner) (Display * d, Atom a, Window w, Time t); /* 65 */
@@ -1420,7 +1420,7 @@ typedef struct TkIntXlibStubs {
 } TkIntXlibStubs;
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
-extern CONST TkIntXlibStubs *tkIntXlibStubsPtr;
+extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)