diff options
| author | culler <culler> | 2021-11-10 14:33:25 (GMT) |
|---|---|---|
| committer | culler <culler> | 2021-11-10 14:33:25 (GMT) |
| commit | 218fc2fe4c7fba58719948d2dace2b5da5ae9d3b (patch) | |
| tree | 6ec0767bd354f47eef3ebca1fc7eeb7d8f52857e | |
| parent | 39ddc9261774fb50b3e23bb4be71fe2d95bef3f4 (diff) | |
| download | tk-218fc2fe4c7fba58719948d2dace2b5da5ae9d3b.zip tk-218fc2fe4c7fba58719948d2dace2b5da5ae9d3b.tar.gz tk-218fc2fe4c7fba58719948d2dace2b5da5ae9d3b.tar.bz2 | |
Remove code left by mistake; add a missing call to orderOut; be consistent when calling orderOut.
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 7 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXWm.c | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index b841e04..bd0f60a 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -314,7 +314,7 @@ XUnmapWindow( * noted in tkMacOSXWm.c this does not happen, in spite of * Apple's claims to the contrary. */ - + for (NSWindow *w in [NSApp orderedWindows]) { TkWindow *winPtr2 = TkMacOSXGetTkWindow(w); WmInfo *wmInfoPtr; @@ -332,14 +332,11 @@ XUnmapWindow( break; } } - NSWindow *top = [[NSApp windows] firstObject]; - if (top) { - [top makeKeyAndOrderFront:NSApp]; - } } } TkMacOSXInvalClipRgns((Tk_Window)winPtr); } else { + /* * Rebuild the visRgn clip region for the parent so it will be allowed * to draw in the space from which this subwindow was removed and then diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 8fd5a61..5d90716 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -337,7 +337,7 @@ static void RefocusGrabWindow(void *data) { continue; } if (winPtr->wmInfoPtr->hints.initial_state == WithdrawnState) { - [win orderOut:nil]; + [win orderOut:NSApp]; } if (winPtr->dispPtr->grabWinPtr == winPtr) { Tcl_DoWhenIdle(RefocusGrabWindow, winPtr); diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 0f49e4b..26617a4 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -2827,7 +2827,7 @@ WmIconwindowCmd( */ TkpWmSetState(oldIcon, WithdrawnState); - [win orderOut:nil]; + [win orderOut:NSApp]; [win setExcludedFromWindowsMenu:YES]; wmPtr3->iconFor = NULL; } @@ -6464,6 +6464,7 @@ TkpWmSetState( } if (state == WithdrawnState) { Tk_UnmapWindow((Tk_Window)winPtr); + [macWin orderOut:NSApp]; } else if (state == IconicState) { /* |