diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-27 17:08:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-27 17:08:11 (GMT) |
| commit | ed9cf42792f8332d1386414e459c9a4af9c66238 (patch) | |
| tree | 24f6406655c0f69f4defd52000bba323ec167b93 /generic | |
| parent | 4636816c13f9e6a6889fe871f54c0a17151e6513 (diff) | |
| parent | 09cadff7abbce69fb5d07b88b20f6461a05a0541 (diff) | |
| download | tk-ed9cf42792f8332d1386414e459c9a4af9c66238.zip tk-ed9cf42792f8332d1386414e459c9a4af9c66238.tar.gz tk-ed9cf42792f8332d1386414e459c9a4af9c66238.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkGrid.c | 2 | ||||
| -rw-r--r-- | generic/tkInt.decls | 2 | ||||
| -rw-r--r-- | generic/tkInt.h | 2 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 8 | ||||
| -rw-r--r-- | generic/tkPack.c | 2 | ||||
| -rw-r--r-- | generic/tkPlace.c | 2 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 067407a..51b9512 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -3361,7 +3361,7 @@ ConfigureContent( */ for (container = (TkWindow *)containerPtr->tkwin; container != NULL; - container = (TkWindow *)TkGetGeomMaster(container)) { + container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)content) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put \"%s\" inside \"%s\": would cause management loop", diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 1388367..7886355 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1030,7 +1030,7 @@ declare 47 aqua { Tk_Window TkpGetCapture(void) } declare 49 aqua { - Tk_Window TkGetTransientMaster(TkWindow *winPtr) + Tk_Window TkMacOSXGetContainer(TkWindow *winPtr) } declare 50 aqua { int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) diff --git a/generic/tkInt.h b/generic/tkInt.h index a5e98c0..10fa4e2 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -374,7 +374,7 @@ typedef struct TkDisplay { * by that container. */ int geomInit; -#define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ +#define TkGetContainer(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \ ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr) /* diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 88b36ce..348868b 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -244,7 +244,7 @@ EXTERN int TkpIsWindowFloating(void *window); EXTERN Tk_Window TkpGetCapture(void); /* Slot 48 is reserved */ /* 49 */ -EXTERN Tk_Window TkGetTransientMaster(TkWindow *winPtr); +EXTERN Tk_Window TkMacOSXGetContainer(TkWindow *winPtr); /* 50 */ EXTERN int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state); @@ -439,7 +439,7 @@ typedef struct TkIntPlatStubs { int (*tkpIsWindowFloating) (void *window); /* 46 */ Tk_Window (*tkpGetCapture) (void); /* 47 */ void (*reserved48)(void); - Tk_Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */ + Tk_Window (*tkMacOSXGetContainer) (TkWindow *winPtr); /* 49 */ int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */ void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */ void (*tkMacOSXSetDrawingEnabled) (TkWindow *winPtr, int flag); /* 52 */ @@ -694,8 +694,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; #define TkpGetCapture \ (tkIntPlatStubsPtr->tkpGetCapture) /* 47 */ /* Slot 48 is reserved */ -#define TkGetTransientMaster \ - (tkIntPlatStubsPtr->tkGetTransientMaster) /* 49 */ +#define TkMacOSXGetContainer \ + (tkIntPlatStubsPtr->tkMacOSXGetContainer) /* 49 */ #define TkGenerateButtonEvent \ (tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 50 */ #define TkGenWMDestroyEvent \ diff --git a/generic/tkPack.c b/generic/tkPack.c index d73de4a..00597b3 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -1821,7 +1821,7 @@ ConfigureContent( */ for (container = (TkWindow *)containerPtr->tkwin; container != NULL; - container = (TkWindow *)TkGetGeomMaster(container)) { + container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)content) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put \"%s\" inside \"%s\": would cause management loop", diff --git a/generic/tkPlace.c b/generic/tkPlace.c index 01386a2..7625362 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -702,7 +702,7 @@ ConfigureContent( */ for (container = (TkWindow *)tkwin; container != NULL; - container = (TkWindow *)TkGetGeomMaster(container)) { + container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)contentPtr->tkwin) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "can't put \"%s\" inside \"%s\": would cause management loop", diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 8d863c1..f459fbd 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -625,7 +625,7 @@ static const TkIntPlatStubs tkIntPlatStubs = { TkpIsWindowFloating, /* 46 */ TkpGetCapture, /* 47 */ 0, /* 48 */ - TkGetTransientMaster, /* 49 */ + TkMacOSXGetContainer, /* 49 */ TkGenerateButtonEvent, /* 50 */ TkGenWMDestroyEvent, /* 51 */ TkMacOSXSetDrawingEnabled, /* 52 */ |