diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-10-15 16:28:19 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-10-15 16:28:19 (GMT) |
| commit | 68328c18209e95af51d982544f0b4056b9e4cf60 (patch) | |
| tree | 1081a179fd0ac542e24774344873369523a50845 /win | |
| parent | cbee61582435844b8e956da05e3f152dba4ded5a (diff) | |
| download | tk-68328c18209e95af51d982544f0b4056b9e4cf60.zip tk-68328c18209e95af51d982544f0b4056b9e4cf60.tar.gz tk-68328c18209e95af51d982544f0b4056b9e4cf60.tar.bz2 | |
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.
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinWm.c | 9 |
1 files changed, 4 insertions, 5 deletions
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; |