summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tkGrid.c2
-rw-r--r--generic/tkInt.decls2
-rw-r--r--generic/tkInt.h2
-rw-r--r--generic/tkIntPlatDecls.h8
-rw-r--r--generic/tkPack.c2
-rw-r--r--generic/tkPlace.c2
-rw-r--r--generic/tkStubInit.c2
-rw-r--r--macosx/tkMacOSXWm.c12
-rw-r--r--macosx/ttkMacOSXTheme.c4
9 files changed, 18 insertions, 18 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 */
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index cad005d..3bc12d7 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -946,7 +946,7 @@ TkWmDeadWindow(
for (Transient *transientPtr = wmPtr->transientPtr;
transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
TkWindow *winPtr2 = transientPtr->winPtr;
- TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
+ TkWindow *containerPtr = (TkWindow *)TkMacOSXGetContainer(winPtr2);
if (containerPtr == winPtr) {
wmPtr2 = winPtr2->wmInfoPtr;
@@ -1841,7 +1841,7 @@ WmDeiconifyCmd(
transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
TkWindow *winPtr2 = transientPtr->winPtr;
WmInfo *wmPtr2 = winPtr2->wmInfoPtr;
- TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
+ TkWindow *containerPtr = (TkWindow *)TkMacOSXGetContainer(winPtr2);
if (containerPtr == winPtr) {
if ((wmPtr2->hints.initial_state == WithdrawnState) &&
@@ -2385,7 +2385,7 @@ WmIconifyCmd(
for (Transient *transientPtr = wmPtr->transientPtr;
transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
TkWindow *winPtr2 = transientPtr->winPtr;
- TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
+ TkWindow *containerPtr = (TkWindow *)TkMacOSXGetContainer(winPtr2);
if (containerPtr == winPtr &&
winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
TkpWmSetState(winPtr2, WithdrawnState);
@@ -3815,7 +3815,7 @@ WmWithdrawCmd(
for (Transient *transientPtr = wmPtr->transientPtr;
transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
TkWindow *winPtr2 = transientPtr->winPtr;
- TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
+ TkWindow *containerPtr = (TkWindow *)TkMacOSXGetContainer(winPtr2);
if (containerPtr == winPtr &&
winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
@@ -5337,7 +5337,7 @@ TkSetWMName(
/*
*----------------------------------------------------------------------
*
- * TkGetTransientMaster --
+ * TkMacOSXGetContainer --
*
* If the passed window has the TRANSIENT_FOR property set this will
* return the container window. Otherwise it will return None.
@@ -5352,7 +5352,7 @@ TkSetWMName(
*/
Tk_Window
-TkGetTransientMaster(
+TkMacOSXGetContainer(
TkWindow *winPtr)
{
if (winPtr->wmInfoPtr != NULL) {
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 8bc8ef6..1a7ce39 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -256,13 +256,13 @@ static void GetBackgroundColor(
CGFloat *rgba)
{
TkWindow *winPtr = (TkWindow *)tkwin;
- TkWindow *containerPtr = (TkWindow *)TkGetGeomMaster(tkwin);
+ TkWindow *containerPtr = (TkWindow *)TkGetContainer(tkwin);
while (containerPtr && containerPtr->privatePtr) {
if (containerPtr->privatePtr->flags & TTK_HAS_CONTRASTING_BG) {
break;
}
- containerPtr = (TkWindow *)TkGetGeomMaster(containerPtr);
+ containerPtr = (TkWindow *)TkGetContainer(containerPtr);
}
if (containerPtr && containerPtr->privatePtr) {
for (int i = 0; i < 4; i++) {
generated by cgit v0.12 at 2024-11-10 06:05:49 (GMT)