diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-02 13:43:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-02 13:43:53 (GMT) |
| commit | 45fbad8c2ccccc529eb2acb4b5c78afd86ac6f6d (patch) | |
| tree | a5f5788810a7b0acd0a74fce296b0696f0be0eca /generic | |
| parent | 3f6b5d273ca6fa8715e18fc33829c04202e6e4d7 (diff) | |
| parent | f0ef3d461a52b9fdb6e0a1f0afa40274fe06ea89 (diff) | |
| download | tk-45fbad8c2ccccc529eb2acb4b5c78afd86ac6f6d.zip tk-45fbad8c2ccccc529eb2acb4b5c78afd86ac6f6d.tar.gz tk-45fbad8c2ccccc529eb2acb4b5c78afd86ac6f6d.tar.bz2 | |
Add XLowerWindow to MacOS X11 stub table
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCanvPoly.c | 2 | ||||
| -rw-r--r-- | generic/tkCmds.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.decls | 3 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 8 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index eeba814..2663894 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -121,7 +121,7 @@ static const Tk_ConfigSpec configSpecs[] = { "0,0", offsetof(PolygonItem, tsoffset), TK_CONFIG_NULL_OK, &offsetOption}, {TK_CONFIG_COLOR, "-outline", NULL, NULL, - DEF_CANVITEM_OUTLINE, offsetof(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL}, + NULL, offsetof(PolygonItem, outline.color), TK_CONFIG_NULL_OK, NULL}, {TK_CONFIG_CUSTOM, "-outlineoffset", NULL, NULL, "0,0", offsetof(PolygonItem, outline.tsoffset), TK_CONFIG_NULL_OK, &offsetOption}, diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 4908fee..d7f742a 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -882,7 +882,7 @@ UseinputmethodsCmd( &boolVal) != TCL_OK) { return TCL_ERROR; } - if (boolVal) { + if (boolVal && (dispPtr->inputMethod != NULL)) { dispPtr->flags |= TK_DISPLAY_USE_IM; } else { dispPtr->flags &= ~TK_DISPLAY_USE_IM; diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 378cc6b..0b0a370 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1880,6 +1880,9 @@ declare 122 macosx { Visual *visual, unsigned long value_mask, XSetWindowAttributes *attributes) } +declare 129 macosx { + int XLowerWindow(Display *d, Window w) +} declare 130 macosx { int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n) } diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 65de70c..ce590a2 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -745,7 +745,8 @@ EXTERN Window XCreateWindow(Display *display, Window parent, int x, /* Slot 126 is reserved */ /* Slot 127 is reserved */ /* Slot 128 is reserved */ -/* Slot 129 is reserved */ +/* 129 */ +EXTERN int XLowerWindow(Display *d, Window w); /* 130 */ EXTERN int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n); @@ -1069,7 +1070,7 @@ typedef struct TkIntXlibStubs { void (*reserved126)(void); void (*reserved127)(void); void (*reserved128)(void); - void (*reserved129)(void); + int (*xLowerWindow) (Display *d, Window w); /* 129 */ int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */ int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */ int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */ @@ -1612,7 +1613,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; /* Slot 126 is reserved */ /* Slot 127 is reserved */ /* Slot 128 is reserved */ -/* Slot 129 is reserved */ +#define XLowerWindow \ + (tkIntXlibStubsPtr->xLowerWindow) /* 129 */ #define XFillArcs \ (tkIntXlibStubsPtr->xFillArcs) /* 130 */ #define XDrawArcs \ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index bc2fd7c..de0bc84 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -870,7 +870,7 @@ static const TkIntXlibStubs tkIntXlibStubs = { 0, /* 126 */ 0, /* 127 */ 0, /* 128 */ - 0, /* 129 */ + XLowerWindow, /* 129 */ XFillArcs, /* 130 */ XDrawArcs, /* 131 */ XDrawRectangles, /* 132 */ |