From 68328c18209e95af51d982544f0b4056b9e4cf60 Mon Sep 17 00:00:00 2001 From: fvogel Date: Sun, 15 Oct 2023 16:28:19 +0000 Subject: Propagate changes from the previous commit to plaftorms other than Linux. This commit is for consistency only, because platforms other than X11 do not send an XSizeHints structure to the underlying window manager. --- macosx/tkMacOSXWm.c | 9 ++++----- win/tkWinWm.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 0adfe4b..858ac34 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -2205,7 +2205,7 @@ WmGridCmd( * ungridded numbers. */ - wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc); + wmPtr->sizeHintsFlags &= ~PBaseSize; if (wmPtr->width != -1) { wmPtr->width = winPtr->reqWidth + (wmPtr->width - wmPtr->reqGridWidth)*wmPtr->widthInc; @@ -3984,8 +3984,7 @@ Tk_SetGrid( && (wmPtr->reqGridHeight == reqHeight) && (wmPtr->widthInc == widthInc) && (wmPtr->heightInc == heightInc) - && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc)) - == (PBaseSize|PResizeInc))) { + && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) { return; } @@ -4015,7 +4014,7 @@ Tk_SetGrid( wmPtr->reqGridHeight = reqHeight; wmPtr->widthInc = widthInc; wmPtr->heightInc = heightInc; - wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc; + wmPtr->sizeHintsFlags |= PBaseSize; wmPtr->flags |= WM_UPDATE_SIZE_HINTS; if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr); @@ -4063,7 +4062,7 @@ Tk_UnsetGrid( } wmPtr->gridWin = NULL; - wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc); + wmPtr->sizeHintsFlags &= ~PBaseSize; if (wmPtr->width != -1) { wmPtr->width = winPtr->reqWidth + (wmPtr->width - wmPtr->reqGridWidth)*wmPtr->widthInc; diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 34ae154..98c699e 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3847,7 +3847,7 @@ WmGridCmd( * ungridded numbers. */ - wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc); + wmPtr->sizeHintsFlags &= ~PBaseSize; if (wmPtr->width != -1) { wmPtr->width = winPtr->reqWidth + (wmPtr->width - wmPtr->reqGridWidth)*wmPtr->widthInc; @@ -5793,8 +5793,7 @@ Tk_SetGrid( && (wmPtr->reqGridHeight == reqHeight) && (wmPtr->widthInc == widthInc) && (wmPtr->heightInc == heightInc) - && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc)) - == (PBaseSize|PResizeInc))) { + && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) { return; } @@ -5825,7 +5824,7 @@ Tk_SetGrid( wmPtr->reqGridHeight = reqHeight; wmPtr->widthInc = widthInc; wmPtr->heightInc = heightInc; - wmPtr->sizeHintsFlags |= PBaseSize|PResizeInc; + wmPtr->sizeHintsFlags |= PBaseSize; if (!(wmPtr->flags & (WM_UPDATE_PENDING|WM_NEVER_MAPPED))) { Tcl_DoWhenIdle(UpdateGeometryInfo, winPtr); wmPtr->flags |= WM_UPDATE_PENDING; @@ -5876,7 +5875,7 @@ Tk_UnsetGrid( } wmPtr->gridWin = NULL; - wmPtr->sizeHintsFlags &= ~(PBaseSize|PResizeInc); + wmPtr->sizeHintsFlags &= ~PBaseSize; if (wmPtr->width != -1) { wmPtr->width = winPtr->reqWidth + (wmPtr->width - wmPtr->reqGridWidth)*wmPtr->widthInc; -- cgit v0.12