Added more X functions to the stubs table.

7 files changed, 584 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index 13216b7..2d31396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-04-5     <redman@scriptics.com>
+
+	* generic/tkInt.decls:
+	* generic/tkIntXlibDecls.h:
+	* generic/tkStubInit.c:
+	* xlib/xgc.c:
+	* xlib/X11/Xlib.h:
+	* xlib/X11/Xutil.h: Added more X functions to the Win & Mac stubs
+	tables.
+	
 1999-04-05    <stanton@scriptics.com>
 
 	* unix/configure.in:
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index cf990ac..74583df 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1,4 +1,4 @@
-# tkInt.decls --
+	# tkInt.decls --
 #
 #	This file contains the declarations for all unsupported
 #	functions that are exported by the Tk library.  This file
@@ -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.2.2.4 1999/03/30 04:12:25 stanton Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.2.2.5 1999/04/06 02:48:27 redman Exp $
 
 library tk
 
@@ -1418,11 +1418,106 @@ declare 80 win {
 #      XSetClipRectangles(Display *display, GC gc, int clip_x_origin, \
 #  	    int clip_y_origin, XRectangle rectangles[], int n, int ordering)
 #  }
+
 declare 82 win {
     Status XParseColor (Display *display, Colormap map, \
           _Xconst char* spec, XColor *colorPtr)
 }
 
+declare 83 win {
+    GC XCreateGC(Display* display, Drawable d, \
+	    unsigned long valuemask, XGCValues* values)
+}
+
+declare 84 win {
+    void XFreeGC(Display* display, GC gc)
+}
+
+declare 85 win {
+    Atom XInternAtom(Display* display,_Xconst char* atom_name, \
+	    Bool only_if_exists)
+}
+
+declare 86 win {
+    void XSetBackground(Display* display, GC gc, \
+	    unsigned long foreground)
+}
+
+declare 87 win {
+    void XSetForeground(Display* display, GC gc, \
+	    unsigned long foreground)
+}
+
+declare 88 win {
+    void XSetClipMask(Display* display, GC gc, Pixmap pixmap)
+}
+
+declare 89 win {
+    void XSetClipOrigin(Display* display, GC gc, \
+	    int clip_x_origin, int clip_y_origin)
+}
+
+declare 90 win {
+    void XSetTSOrigin(Display* display, GC gc, \
+	    int ts_x_origin, int ts_y_origin)
+}
+
+declare 91 win {
+    void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values)
+}
+
+declare 92 win {
+    void XSetFont(Display *display, GC gc, Font font)
+}
+
+declare 93 win {
+    void XSetArcMode(Display *display, GC gc, int arc_mode)
+}
+
+declare 94 win {
+    void XSetStipple(Display *display, GC gc, Pixmap stipple)
+}
+
+declare 95 win {
+    void XSetFillRule(Display *display, GC gc, int fill_rule)
+}
+
+declare 96 win {
+    void XSetFillStyle(Display *display, GC gc, int fill_style)
+}
+
+declare 97 win {
+    void XSetFunction(Display *display, GC gc, int function)
+}
+
+declare 98 win {
+    void XSetLineAttributes(Display *display, GC gc, \
+	    unsigned int line_width, int line_style, \
+	    int cap_style, int join_style)
+}
+
+declare 99 win {
+    int _XInitImageFuncPtrs(XImage *image)
+}
+
+declare 100 win {
+    XIC XCreateIC(void)
+}
+
+declare 101 win {
+    XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \
+	    XVisualInfo* vinfo_template, int* nitems_return)
+}
+
+declare 102 win {
+    void XSetWMClientMachine(Display* display, Window w, XTextProperty* text_prop)
+}
+
+declare 103 win {
+    Status XStringListToTextProperty(char** list, int count, \
+	    XTextProperty* text_prop_return)
+}
+
 # X functions for Mac
 
 # This slot is reserved for use by the dash patch:
@@ -1693,3 +1788,96 @@ declare 58 mac {
           _Xconst char* spec, XColor *colorPtr)
 }
 
+declare 59 mac {
+    GC XCreateGC(Display* display, Drawable d, \
+	    unsigned long valuemask, XGCValues* values)
+}
+
+declare 60 mac {
+    void XFreeGC(Display* display, GC gc)
+}
+
+declare 61 mac {
+    Atom XInternAtom(Display* display,_Xconst char* atom_name, \
+	    Bool only_if_exists)
+}
+
+declare 62 mac {
+    void XSetBackground(Display* display, GC gc, \
+	    unsigned long foreground)
+}
+
+declare 63 mac {
+    void XSetForeground(Display* display, GC gc, \
+	    unsigned long foreground)
+}
+
+declare 64 mac {
+    void XSetClipMask(Display* display, GC gc, Pixmap pixmap)
+}
+
+declare 65 mac {
+    void XSetClipOrigin(Display* display, GC gc, \
+	    int clip_x_origin, int clip_y_origin)
+}
+
+declare 66 mac {
+    void XSetTSOrigin(Display* display, GC gc, \
+	    int ts_x_origin, int ts_y_origin)
+}
+
+declare 67 mac {
+    void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values)
+}
+
+declare 68 mac {
+    void XSetFont(Display *display, GC gc, Font font)
+}
+
+declare 69 mac {
+    void XSetArcMode(Display *display, GC gc, int arc_mode)
+}
+
+declare 70 mac {
+    void XSetStipple(Display *display, GC gc, Pixmap stipple)
+}
+
+declare 71 mac {
+    void XSetFillRule(Display *display, GC gc, int fill_rule)
+}
+
+declare 72 mac {
+    void XSetFillStyle(Display *display, GC gc, int fill_style)
+}
+
+declare 73 mac {
+    void XSetFunction(Display *display, GC gc, int function)
+}
+
+declare 74 mac {
+    void XSetLineAttributes(Display *display, GC gc, \
+	    unsigned int line_width, int line_style, \
+	    int cap_style, int join_style)
+}
+
+declare 75 mac {
+    int _XInitImageFuncPtrs(XImage *image)
+}
+
+declare 76 mac {
+    XIC XCreateIC(void)
+}
+
+declare 77 mac {
+    XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \
+	    XVisualInfo* vinfo_template, int* nitems_return)
+}
+
+declare 78 mac {
+    void XSetWMClientMachine(Display* display, Window w, XTextProperty* text_prop)
+}
+
+declare 79 mac {
+    Status XStringListToTextProperty(char** list, int count, \
+	    XTextProperty* text_prop_return)
+}
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index e1e616e..a298616 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,12 +9,14 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.2.2.4 1999/03/30 04:12:57 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.2.2.5 1999/04/06 02:48:28 redman Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
 #define _TKINTXLIBDECLS
 
+#include "X11/Xutil.h"
+
 #ifdef BUILD_tk
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLEXPORT
@@ -282,6 +284,69 @@ EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors,
 EXTERN Status		XParseColor _ANSI_ARGS_((Display * display, 
 				Colormap map, _Xconst char* spec, 
 				XColor * colorPtr));
+/* 83 */
+EXTERN GC		XCreateGC _ANSI_ARGS_((Display* display, Drawable d, 
+				unsigned long valuemask, XGCValues* values));
+/* 84 */
+EXTERN void		XFreeGC _ANSI_ARGS_((Display* display, GC gc));
+/* 85 */
+EXTERN Atom		XInternAtom _ANSI_ARGS_((Display* display, 
+				_Xconst char* atom_name, Bool only_if_exists));
+/* 86 */
+EXTERN void		XSetBackground _ANSI_ARGS_((Display* display, GC gc, 
+				unsigned long foreground));
+/* 87 */
+EXTERN void		XSetForeground _ANSI_ARGS_((Display* display, GC gc, 
+				unsigned long foreground));
+/* 88 */
+EXTERN void		XSetClipMask _ANSI_ARGS_((Display* display, GC gc, 
+				Pixmap pixmap));
+/* 89 */
+EXTERN void		XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, 
+				int clip_x_origin, int clip_y_origin));
+/* 90 */
+EXTERN void		XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, 
+				int ts_x_origin, int ts_y_origin));
+/* 91 */
+EXTERN void		XChangeGC _ANSI_ARGS_((Display * d, GC gc, 
+				unsigned long mask, XGCValues * values));
+/* 92 */
+EXTERN void		XSetFont _ANSI_ARGS_((Display * display, GC gc, 
+				Font font));
+/* 93 */
+EXTERN void		XSetArcMode _ANSI_ARGS_((Display * display, GC gc, 
+				int arc_mode));
+/* 94 */
+EXTERN void		XSetStipple _ANSI_ARGS_((Display * display, GC gc, 
+				Pixmap stipple));
+/* 95 */
+EXTERN void		XSetFillRule _ANSI_ARGS_((Display * display, GC gc, 
+				int fill_rule));
+/* 96 */
+EXTERN void		XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, 
+				int fill_style));
+/* 97 */
+EXTERN void		XSetFunction _ANSI_ARGS_((Display * display, GC gc, 
+				int function));
+/* 98 */
+EXTERN void		XSetLineAttributes _ANSI_ARGS_((Display * display, 
+				GC gc, unsigned int line_width, 
+				int line_style, int cap_style, 
+				int join_style));
+/* 99 */
+EXTERN int		_XInitImageFuncPtrs _ANSI_ARGS_((XImage * image));
+/* 100 */
+EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
+/* 101 */
+EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display* display, 
+				long vinfo_mask, XVisualInfo* vinfo_template, 
+				int* nitems_return));
+/* 102 */
+EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display, 
+				Window w, XTextProperty* text_prop));
+/* 103 */
+EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
+				int count, XTextProperty* text_prop_return));
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* Slot 0 is reserved */
@@ -466,6 +531,69 @@ EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors,
 EXTERN Status		XParseColor _ANSI_ARGS_((Display * display, 
 				Colormap map, _Xconst char* spec, 
 				XColor * colorPtr));
+/* 59 */
+EXTERN GC		XCreateGC _ANSI_ARGS_((Display* display, Drawable d, 
+				unsigned long valuemask, XGCValues* values));
+/* 60 */
+EXTERN void		XFreeGC _ANSI_ARGS_((Display* display, GC gc));
+/* 61 */
+EXTERN Atom		XInternAtom _ANSI_ARGS_((Display* display, 
+				_Xconst char* atom_name, Bool only_if_exists));
+/* 62 */
+EXTERN void		XSetBackground _ANSI_ARGS_((Display* display, GC gc, 
+				unsigned long foreground));
+/* 63 */
+EXTERN void		XSetForeground _ANSI_ARGS_((Display* display, GC gc, 
+				unsigned long foreground));
+/* 64 */
+EXTERN void		XSetClipMask _ANSI_ARGS_((Display* display, GC gc, 
+				Pixmap pixmap));
+/* 65 */
+EXTERN void		XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, 
+				int clip_x_origin, int clip_y_origin));
+/* 66 */
+EXTERN void		XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, 
+				int ts_x_origin, int ts_y_origin));
+/* 67 */
+EXTERN void		XChangeGC _ANSI_ARGS_((Display * d, GC gc, 
+				unsigned long mask, XGCValues * values));
+/* 68 */
+EXTERN void		XSetFont _ANSI_ARGS_((Display * display, GC gc, 
+				Font font));
+/* 69 */
+EXTERN void		XSetArcMode _ANSI_ARGS_((Display * display, GC gc, 
+				int arc_mode));
+/* 70 */
+EXTERN void		XSetStipple _ANSI_ARGS_((Display * display, GC gc, 
+				Pixmap stipple));
+/* 71 */
+EXTERN void		XSetFillRule _ANSI_ARGS_((Display * display, GC gc, 
+				int fill_rule));
+/* 72 */
+EXTERN void		XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, 
+				int fill_style));
+/* 73 */
+EXTERN void		XSetFunction _ANSI_ARGS_((Display * display, GC gc, 
+				int function));
+/* 74 */
+EXTERN void		XSetLineAttributes _ANSI_ARGS_((Display * display, 
+				GC gc, unsigned int line_width, 
+				int line_style, int cap_style, 
+				int join_style));
+/* 75 */
+EXTERN int		_XInitImageFuncPtrs _ANSI_ARGS_((XImage * image));
+/* 76 */
+EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
+/* 77 */
+EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display* display, 
+				long vinfo_mask, XVisualInfo* vinfo_template, 
+				int* nitems_return));
+/* 78 */
+EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display, 
+				Window w, XTextProperty* text_prop));
+/* 79 */
+EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
+				int count, XTextProperty* text_prop_return));
 #endif /* MAC_TCL */
 
 typedef struct TkIntXlibStubs {
@@ -556,6 +684,27 @@ typedef struct TkIntXlibStubs {
     void (*tkPutImage) _ANSI_ARGS_((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)); /* 80 */
     void *reserved81;
     Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 82 */
+    GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 83 */
+    void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 84 */
+    Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 85 */
+    void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 86 */
+    void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 87 */
+    void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 88 */
+    void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */
+    void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */
+    void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 91 */
+    void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 92 */
+    void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 93 */
+    void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 94 */
+    void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 95 */
+    void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 96 */
+    void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 97 */
+    void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */
+    int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 99 */
+    XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */
+    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 101 */
+    void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 102 */
+    Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 103 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     void *reserved0;
@@ -617,6 +766,27 @@ typedef struct TkIntXlibStubs {
     void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */
     void (*tkPutImage) _ANSI_ARGS_((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)); /* 57 */
     Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */
+    GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */
+    void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */
+    Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */
+    void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */
+    void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */
+    void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */
+    void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
+    void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
+    void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */
+    void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */
+    void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */
+    void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 70 */
+    void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 71 */
+    void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 72 */
+    void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 73 */
+    void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
+    int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */
+    XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
+    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */
+    void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */
+    Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */
 #endif /* MAC_TCL */
 } TkIntXlibStubs;
 
@@ -955,6 +1125,90 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 82 */
 #endif
+#ifndef XCreateGC
+#define XCreateGC \
+	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
+#endif
+#ifndef XFreeGC
+#define XFreeGC \
+	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
+#endif
+#ifndef XInternAtom
+#define XInternAtom \
+	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
+#endif
+#ifndef XSetBackground
+#define XSetBackground \
+	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
+#endif
+#ifndef XSetForeground
+#define XSetForeground \
+	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
+#endif
+#ifndef XSetClipMask
+#define XSetClipMask \
+	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
+#endif
+#ifndef XSetClipOrigin
+#define XSetClipOrigin \
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
+#endif
+#ifndef XSetTSOrigin
+#define XSetTSOrigin \
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
+#endif
+#ifndef XChangeGC
+#define XChangeGC \
+	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
+#endif
+#ifndef XSetFont
+#define XSetFont \
+	(tkIntXlibStubsPtr->xSetFont) /* 92 */
+#endif
+#ifndef XSetArcMode
+#define XSetArcMode \
+	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
+#endif
+#ifndef XSetStipple
+#define XSetStipple \
+	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
+#endif
+#ifndef XSetFillRule
+#define XSetFillRule \
+	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
+#endif
+#ifndef XSetFillStyle
+#define XSetFillStyle \
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
+#endif
+#ifndef XSetFunction
+#define XSetFunction \
+	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
+#endif
+#ifndef XSetLineAttributes
+#define XSetLineAttributes \
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
+#endif
+#ifndef _XInitImageFuncPtrs
+#define _XInitImageFuncPtrs \
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
+#endif
+#ifndef XCreateIC
+#define XCreateIC \
+	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
+#endif
+#ifndef XGetVisualInfo
+#define XGetVisualInfo \
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
+#endif
+#ifndef XSetWMClientMachine
+#define XSetWMClientMachine \
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
+#endif
+#ifndef XStringListToTextProperty
+#define XStringListToTextProperty \
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
+#endif
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
 /* Slot 0 is reserved */
@@ -1190,6 +1444,90 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 58 */
 #endif
+#ifndef XCreateGC
+#define XCreateGC \
+	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
+#endif
+#ifndef XFreeGC
+#define XFreeGC \
+	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
+#endif
+#ifndef XInternAtom
+#define XInternAtom \
+	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
+#endif
+#ifndef XSetBackground
+#define XSetBackground \
+	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
+#endif
+#ifndef XSetForeground
+#define XSetForeground \
+	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
+#endif
+#ifndef XSetClipMask
+#define XSetClipMask \
+	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
+#endif
+#ifndef XSetClipOrigin
+#define XSetClipOrigin \
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
+#endif
+#ifndef XSetTSOrigin
+#define XSetTSOrigin \
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
+#endif
+#ifndef XChangeGC
+#define XChangeGC \
+	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
+#endif
+#ifndef XSetFont
+#define XSetFont \
+	(tkIntXlibStubsPtr->xSetFont) /* 68 */
+#endif
+#ifndef XSetArcMode
+#define XSetArcMode \
+	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
+#endif
+#ifndef XSetStipple
+#define XSetStipple \
+	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
+#endif
+#ifndef XSetFillRule
+#define XSetFillRule \
+	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
+#endif
+#ifndef XSetFillStyle
+#define XSetFillStyle \
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
+#endif
+#ifndef XSetFunction
+#define XSetFunction \
+	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
+#endif
+#ifndef XSetLineAttributes
+#define XSetLineAttributes \
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
+#endif
+#ifndef _XInitImageFuncPtrs
+#define _XInitImageFuncPtrs \
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
+#endif
+#ifndef XCreateIC
+#define XCreateIC \
+	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
+#endif
+#ifndef XGetVisualInfo
+#define XGetVisualInfo \
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
+#endif
+#ifndef XSetWMClientMachine
+#define XSetWMClientMachine \
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
+#endif
+#ifndef XStringListToTextProperty
+#define XStringListToTextProperty \
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
+#endif
 #endif /* MAC_TCL */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 01c4799..2d078d7 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.2.2.4 1999/04/01 21:58:50 redman Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.2.2.5 1999/04/06 02:48:29 redman Exp $
  */
 
 #include "tkInt.h"
@@ -594,6 +594,27 @@ TkIntXlibStubs tkIntXlibStubs = {
     TkPutImage, /* 80 */
     NULL, /* 81 */
     XParseColor, /* 82 */
+    XCreateGC, /* 83 */
+    XFreeGC, /* 84 */
+    XInternAtom, /* 85 */
+    XSetBackground, /* 86 */
+    XSetForeground, /* 87 */
+    XSetClipMask, /* 88 */
+    XSetClipOrigin, /* 89 */
+    XSetTSOrigin, /* 90 */
+    XChangeGC, /* 91 */
+    XSetFont, /* 92 */
+    XSetArcMode, /* 93 */
+    XSetStipple, /* 94 */
+    XSetFillRule, /* 95 */
+    XSetFillStyle, /* 96 */
+    XSetFunction, /* 97 */
+    XSetLineAttributes, /* 98 */
+    _XInitImageFuncPtrs, /* 99 */
+    XCreateIC, /* 100 */
+    XGetVisualInfo, /* 101 */
+    XSetWMClientMachine, /* 102 */
+    XStringListToTextProperty, /* 103 */
 #endif /* __WIN32__ */
 #ifdef MAC_TCL
     NULL, /* 0 */
@@ -655,6 +676,27 @@ TkIntXlibStubs tkIntXlibStubs = {
     XUnmapWindow, /* 56 */
     TkPutImage, /* 57 */
     XParseColor, /* 58 */
+    XCreateGC, /* 59 */
+    XFreeGC, /* 60 */
+    XInternAtom, /* 61 */
+    XSetBackground, /* 62 */
+    XSetForeground, /* 63 */
+    XSetClipMask, /* 64 */
+    XSetClipOrigin, /* 65 */
+    XSetTSOrigin, /* 66 */
+    XChangeGC, /* 67 */
+    XSetFont, /* 68 */
+    XSetArcMode, /* 69 */
+    XSetStipple, /* 70 */
+    XSetFillRule, /* 71 */
+    XSetFillStyle, /* 72 */
+    XSetFunction, /* 73 */
+    XSetLineAttributes, /* 74 */
+    _XInitImageFuncPtrs, /* 75 */
+    XCreateIC, /* 76 */
+    XGetVisualInfo, /* 77 */
+    XSetWMClientMachine, /* 78 */
+    XStringListToTextProperty, /* 79 */
 #endif /* MAC_TCL */
 };
 
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 4dc8adf..b185394 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -1190,24 +1190,6 @@ typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
 _XFUNCPROTOBEGIN
 
 
-extern Atom XInternAtom(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    _Xconst char*	/* atom_name */,
-    Bool		/* only_if_exists */		 
-#endif
-);
-
-
-extern GC XCreateGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Drawable		/* d */,
-    unsigned long	/* valuemask */,
-    XGCValues*		/* values */
-#endif
-);
-
 
 extern void XDrawLine(
 #if NeedFunctionPrototypes
@@ -1234,48 +1216,6 @@ extern void XFillRectangle(
 #endif
 );
 
-extern void XFreeGC(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */
-#endif
-);
-
-extern void XSetClipMask(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    Pixmap		/* pixmap */
-#endif
-);
-
-
-extern void XSetClipOrigin(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* clip_x_origin */,
-    int			/* clip_y_origin */
-#endif
-);
-
-extern void XSetForeground(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    unsigned long	/* foreground */
-#endif
-);
-
-extern void XSetTSOrigin(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    GC			/* gc */,
-    int			/* ts_x_origin */,
-    int			/* ts_y_origin */
-#endif
-);
-
 
 #include "tkIntXlibDecls.h"
 
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index 6332850..f6c0a36 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -448,14 +448,6 @@ extern Status XGetTextProperty(
 #endif
 );
 
-extern XVisualInfo *XGetVisualInfo(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    long		/* vinfo_mask */,
-    XVisualInfo*	/* vinfo_template */,
-    int*		/* nitems_return */
-#endif
-);
 
 extern Status XGetWMClientMachine(
 #if NeedFunctionPrototypes
@@ -652,14 +644,6 @@ extern void XSetTextProperty(
 #endif
 );
 
-extern void XSetWMClientMachine(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    Window		/* w */,
-    XTextProperty*	/* text_prop */
-#endif
-);
-
 extern void XSetWMHints(
 #if NeedFunctionPrototypes
     Display*		/* display */,
@@ -762,14 +746,6 @@ extern void XShrinkRegion(
 #endif
 );
 
-extern Status XStringListToTextProperty(
-#if NeedFunctionPrototypes
-    char**		/* list */,
-    int			/* count */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
 extern void XSubtractRegion(
 #if NeedFunctionPrototypes
     Region		/* sra */,
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 0ff17d6..ac95c41 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -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: xgc.c,v 1.1.4.1 1998/09/30 02:19:44 stanton Exp $
+ * RCS: @(#) $Id: xgc.c,v 1.1.4.2 1999/04/06 02:48:30 redman Exp $
  */
 
 #include <tkInt.h>
@@ -150,8 +150,7 @@ XChangeGC(d, gc, mask, values)
  *----------------------------------------------------------------------
  */
 
-void
-XFreeGC(d, gc)
+void XFreeGC(d, gc)
     Display * d;
     GC gc;
 {