diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-11 11:40:07 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-11 11:40:07 (GMT) |
commit | c28292a3923e7c09df16322a73d4b53eaff74b79 (patch) | |
tree | eeb37dcb2087a7980c744dcc19b07bfc396caf44 /generic | |
parent | c24b589a6b793f5112cd11f613af9aa7ae10b55f (diff) | |
download | tk-c28292a3923e7c09df16322a73d4b53eaff74b79.zip tk-c28292a3923e7c09df16322a73d4b53eaff74b79.tar.gz tk-c28292a3923e7c09df16322a73d4b53eaff74b79.tar.bz2 |
Add 3 more stub entries to MacOSX X11 stub table, which win32 already has: XDestroyIC(), XCreatePixmapCursor(), XCreateGlyphCursor()
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkInt.decls | 12 | ||||
-rw-r--r-- | generic/tkIntXlibDecls.h | 28 | ||||
-rw-r--r-- | generic/tkStubInit.c | 6 |
3 files changed, 34 insertions, 12 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 37557f5..14ab250 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1852,6 +1852,18 @@ declare 137 aqua { int sx, int sy, int dx, int dy, unsigned int w, unsigned int h) } +declare 144 aqua { + void XDestroyIC(XIC xic) +} +declare 145 aqua { + Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, + XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2) +} +declare 146 aqua { + Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, + unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, + XColor _Xconst *x2) +} declare 158 aqua { void TkUnusedStubEntry(void) } diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 7626d9d..7c5d815 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -762,9 +762,16 @@ EXTERN int XPutImage(Display *d, Drawable dr, GC gc, XImage *im, /* Slot 141 is reserved */ /* Slot 142 is reserved */ /* Slot 143 is reserved */ -/* Slot 144 is reserved */ -/* Slot 145 is reserved */ -/* Slot 146 is reserved */ +/* 144 */ +EXTERN void XDestroyIC(XIC xic); +/* 145 */ +EXTERN Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2, + XColor *x1, XColor *x2, unsigned int ui1, + unsigned int ui2); +/* 146 */ +EXTERN Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2, + unsigned int ui1, unsigned int ui2, + XColor _Xconst *x1, XColor _Xconst *x2); /* Slot 147 is reserved */ /* Slot 148 is reserved */ /* Slot 149 is reserved */ @@ -1090,9 +1097,9 @@ typedef struct TkIntXlibStubs { void (*reserved141)(void); void (*reserved142)(void); void (*reserved143)(void); - void (*reserved144)(void); - void (*reserved145)(void); - void (*reserved146)(void); + void (*xDestroyIC) (XIC xic); /* 144 */ + Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 145 */ + Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 146 */ void (*reserved147)(void); void (*reserved148)(void); void (*reserved149)(void); @@ -1654,9 +1661,12 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; /* Slot 141 is reserved */ /* Slot 142 is reserved */ /* Slot 143 is reserved */ -/* Slot 144 is reserved */ -/* Slot 145 is reserved */ -/* Slot 146 is reserved */ +#define XDestroyIC \ + (tkIntXlibStubsPtr->xDestroyIC) /* 144 */ +#define XCreatePixmapCursor \ + (tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */ +#define XCreateGlyphCursor \ + (tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */ /* Slot 147 is reserved */ /* Slot 148 is reserved */ /* Slot 149 is reserved */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 836f1d1..ab8b675 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -977,9 +977,9 @@ static const TkIntXlibStubs tkIntXlibStubs = { 0, /* 141 */ 0, /* 142 */ 0, /* 143 */ - 0, /* 144 */ - 0, /* 145 */ - 0, /* 146 */ + XDestroyIC, /* 144 */ + XCreatePixmapCursor, /* 145 */ + XCreateGlyphCursor, /* 146 */ 0, /* 147 */ 0, /* 148 */ 0, /* 149 */ |