summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2023-10-15 16:30:25 (GMT)
committerfvogel <fvogelnew1@free.fr>2023-10-15 16:30:25 (GMT)
commitd79dbc8332c9640340ee67745b0de2e093c6d536 (patch)
tree420073ecd16bf103cb562a2b243c809926f9ba65 /unix
parent5ceb778917d5bd60cef820bfae69dbd540bc18b5 (diff)
downloadtk-d79dbc8332c9640340ee67745b0de2e093c6d536.zip
tk-d79dbc8332c9640340ee67745b0de2e093c6d536.tar.gz
tk-d79dbc8332c9640340ee67745b0de2e093c6d536.tar.bz2
unixWm.test - Let unixWm-45.2 and -45.4 pass on Linux by cherrypicking [b4ae383b] and [391bac1d] that fix bug [22eefb9368].
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixWm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 9154c1d..df9cb76 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -1995,7 +1995,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;
@@ -3819,8 +3819,7 @@ Tk_SetGrid(
&& (wmPtr->reqGridHeight == reqHeight)
&& (wmPtr->widthInc == widthInc)
&& (wmPtr->heightInc == heightInc)
- && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc))
- == (PBaseSize|PResizeInc))) {
+ && ((wmPtr->sizeHintsFlags & PBaseSize) == PBaseSize)) {
return;
}
@@ -3851,7 +3850,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);
@@ -3910,7 +3909,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;
@@ -4878,7 +4877,7 @@ UpdateSizeHints(
hintsPtr->max_aspect.x = wmPtr->maxAspect.x;
hintsPtr->max_aspect.y = wmPtr->maxAspect.y;
hintsPtr->win_gravity = wmPtr->gravity;
- hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize;
+ hintsPtr->flags = wmPtr->sizeHintsFlags | PMinSize | PResizeInc;
/*
* If the window isn't supposed to be resizable, then set the minimum and