From 4b6fc34cb54c1772dd9e2242f90fe9bd913fb362 Mon Sep 17 00:00:00 2001 From: hobbs Date: Sat, 31 Jul 1999 03:36:49 +0000 Subject: 1999-07-30 Jeff Hobbs * tkInt.decls: Added stub entry for XFillRectangle [Bug: 2446] --- generic/tkInt.decls | 10 +++++++++- generic/tkIntXlibDecls.h | 23 ++++++++++++++++++++++- generic/tkStubInit.c | 5 ++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 30157a6..0ab34b2 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.8 1999/06/16 20:11:28 surles Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.9 1999/07/31 03:36:49 hobbs Exp $ library tk @@ -1505,6 +1505,10 @@ declare 104 win { void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ int x2, int y2) } +declare 106 win { + void XFillRectangle (Display* display, Drawable d, GC gc, \ + int x, int y, unsigned int width, unsigned int height) +} # X functions for Mac @@ -1881,3 +1885,7 @@ declare 82 mac { void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ int x2, int y2) } +declare 83 mac { + void XFillRectangle (Display* display, Drawable d, GC gc, \ + int x, int y, unsigned int width, unsigned int height) +} diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 8ad8fd2..d76165f 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.10 1999/06/16 20:11:28 surles Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.11 1999/07/31 03:36:49 hobbs Exp $ */ #ifndef _TKINTXLIBDECLS @@ -354,6 +354,11 @@ EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, /* 104 */ EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); +/* Slot 105 is reserved */ +/* 106 */ +EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, + Drawable d, GC gc, int x, int y, + unsigned int width, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* Slot 0 is reserved */ @@ -611,6 +616,10 @@ EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* display, /* 82 */ EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); +/* 83 */ +EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, + Drawable d, GC gc, int x, int y, + unsigned int width, unsigned int height)); #endif /* MAC_TCL */ typedef struct TkIntXlibStubs { @@ -723,6 +732,8 @@ typedef struct TkIntXlibStubs { 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 */ void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */ + void *reserved105; + void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */ #endif /* __WIN32__ */ #ifdef MAC_TCL void *reserved0; @@ -808,6 +819,7 @@ typedef struct TkIntXlibStubs { void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */ void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */ void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ #endif /* MAC_TCL */ } TkIntXlibStubs; @@ -1240,6 +1252,11 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XDrawLine \ (tkIntXlibStubsPtr->xDrawLine) /* 104 */ #endif +/* Slot 105 is reserved */ +#ifndef XFillRectangle +#define XFillRectangle \ + (tkIntXlibStubsPtr->xFillRectangle) /* 106 */ +#endif #endif /* __WIN32__ */ #ifdef MAC_TCL /* Slot 0 is reserved */ @@ -1571,6 +1588,10 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XDrawLine \ (tkIntXlibStubsPtr->xDrawLine) /* 82 */ #endif +#ifndef XFillRectangle +#define XFillRectangle \ + (tkIntXlibStubsPtr->xFillRectangle) /* 83 */ +#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 18dab1e..3fd720f 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.9 1999/06/16 20:11:29 surles Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.10 1999/07/31 03:36:49 hobbs Exp $ */ #include "tkInt.h" @@ -566,6 +566,8 @@ TkIntXlibStubs tkIntXlibStubs = { XSetWMClientMachine, /* 102 */ XStringListToTextProperty, /* 103 */ XDrawLine, /* 104 */ + NULL, /* 105 */ + XFillRectangle, /* 106 */ #endif /* __WIN32__ */ #ifdef MAC_TCL NULL, /* 0 */ @@ -651,6 +653,7 @@ TkIntXlibStubs tkIntXlibStubs = { XDrawSegments, /* 80 */ XForceScreenSaver, /* 81 */ XDrawLine, /* 82 */ + XFillRectangle, /* 83 */ #endif /* MAC_TCL */ }; -- cgit v0.12