diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-19 08:16:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-19 08:16:21 (GMT) |
| commit | 7cdbb6ae499b0cb38c23d528ff89bba646c52c14 (patch) | |
| tree | 34c076f2aa5d16db3ce3ffbf7d220319ddaf4e13 /generic | |
| parent | 296af77a42b7efdc14a3244bac9647f000eab062 (diff) | |
| download | tk-7cdbb6ae499b0cb38c23d528ff89bba646c52c14.zip tk-7cdbb6ae499b0cb38c23d528ff89bba646c52c14.tar.gz tk-7cdbb6ae499b0cb38c23d528ff89bba646c52c14.tar.bz2 | |
Move stub entry for XSetClipRectangles to 106, since 92 is already filled in Tk 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.decls | 2 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 20 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index d6de4a7..a160541 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1823,7 +1823,7 @@ declare 90 aqua { declare 91 aqua { int XSync(Display *display, Bool discard) } -declare 92 aqua { +declare 106 aqua { int XSetClipRectangles(Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering) } diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 8549880..9d4200a 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -699,10 +699,7 @@ EXTERN Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 91 */ EXTERN int XSync(Display *display, Bool discard); -/* 92 */ -EXTERN int XSetClipRectangles(Display *display, GC gc, - int clip_x_origin, int clip_y_origin, - XRectangle rectangles[], int n, int ordering); +/* Slot 92 is reserved */ /* Slot 93 is reserved */ /* Slot 94 is reserved */ /* Slot 95 is reserved */ @@ -716,7 +713,10 @@ EXTERN int XSetClipRectangles(Display *display, GC gc, /* Slot 103 is reserved */ /* Slot 104 is reserved */ /* Slot 105 is reserved */ -/* Slot 106 is reserved */ +/* 106 */ +EXTERN int XSetClipRectangles(Display *display, GC gc, + int clip_x_origin, int clip_y_origin, + XRectangle rectangles[], int n, int ordering); /* 107 */ EXTERN int XFlush(Display *display); /* 108 */ @@ -1051,7 +1051,7 @@ typedef struct TkIntXlibStubs { int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */ Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */ int (*xSync) (Display *display, Bool discard); /* 91 */ - int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 92 */ + void (*reserved92)(void); void (*reserved93)(void); void (*reserved94)(void); void (*reserved95)(void); @@ -1065,7 +1065,7 @@ typedef struct TkIntXlibStubs { void (*reserved103)(void); void (*reserved104)(void); void (*reserved105)(void); - void (*reserved106)(void); + int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */ int (*xFlush) (Display *display); /* 107 */ int (*xGrabServer) (Display *display); /* 108 */ int (*xUngrabServer) (Display *display); /* 109 */ @@ -1606,8 +1606,7 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; (tkIntXlibStubsPtr->xQueryTree) /* 90 */ #define XSync \ (tkIntXlibStubsPtr->xSync) /* 91 */ -#define XSetClipRectangles \ - (tkIntXlibStubsPtr->xSetClipRectangles) /* 92 */ +/* Slot 92 is reserved */ /* Slot 93 is reserved */ /* Slot 94 is reserved */ /* Slot 95 is reserved */ @@ -1621,7 +1620,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; /* Slot 103 is reserved */ /* Slot 104 is reserved */ /* Slot 105 is reserved */ -/* Slot 106 is reserved */ +#define XSetClipRectangles \ + (tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */ #define XFlush \ (tkIntXlibStubsPtr->xFlush) /* 107 */ #define XGrabServer \ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 14d9a8b..0020fac 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -925,7 +925,7 @@ static const TkIntXlibStubs tkIntXlibStubs = { XQueryColors, /* 89 */ XQueryTree, /* 90 */ XSync, /* 91 */ - XSetClipRectangles, /* 92 */ + 0, /* 92 */ 0, /* 93 */ 0, /* 94 */ 0, /* 95 */ @@ -939,7 +939,7 @@ static const TkIntXlibStubs tkIntXlibStubs = { 0, /* 103 */ 0, /* 104 */ 0, /* 105 */ - 0, /* 106 */ + XSetClipRectangles, /* 106 */ XFlush, /* 107 */ XGrabServer, /* 108 */ XUngrabServer, /* 109 */ |