diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-10-15 16:21:37 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-10-15 16:21:37 (GMT) |
| commit | cbee61582435844b8e956da05e3f152dba4ded5a (patch) | |
| tree | 30effac12c72ca15280ee9b4488f46caffb35b45 /unix | |
| parent | 7276b467c532820b3de4368084728b73d7c0dc87 (diff) | |
| download | tk-cbee61582435844b8e956da05e3f152dba4ded5a.zip tk-cbee61582435844b8e956da05e3f152dba4ded5a.tar.gz tk-cbee61582435844b8e956da05e3f152dba4ded5a.tar.bz2 | |
Fix [22eefb9368]: unixWm-45.2 and unixWm-45.4 fail on Linux.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixWm.c | 11 |
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 |