diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-04 14:51:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-12-04 14:51:04 (GMT) |
| commit | 827291785038d672a14a2d7257e87db0df05cb8c (patch) | |
| tree | effabc8d3b46d9a35550fea60eeb1229801ddbbe | |
| parent | c0764ea9cc2d2af68135605eda1a8214d0afa571 (diff) | |
| download | tk-827291785038d672a14a2d7257e87db0df05cb8c.zip tk-827291785038d672a14a2d7257e87db0df05cb8c.tar.gz tk-827291785038d672a14a2d7257e87db0df05cb8c.tar.bz2 | |
On UNIX, winPtr->window == 0 is as valid as any other windows ID
| -rw-r--r-- | generic/tkWindow.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 2058501..9ab59a3 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -1740,18 +1740,16 @@ Tk_MapWindow( TkWmMapWindow(winPtr); return; } - if ((winPtr->window != None) - && (XMapWindow(winPtr->display, winPtr->window) == Success)) { - winPtr->flags |= TK_MAPPED; - event.type = MapNotify; - event.xmap.serial = LastKnownRequestProcessed(winPtr->display); - event.xmap.send_event = False; - event.xmap.display = winPtr->display; - event.xmap.event = winPtr->window; - event.xmap.window = winPtr->window; - event.xmap.override_redirect = winPtr->atts.override_redirect; - Tk_HandleEvent(&event); - } + winPtr->flags |= TK_MAPPED; + XMapWindow(winPtr->display, winPtr->window); + event.type = MapNotify; + event.xmap.serial = LastKnownRequestProcessed(winPtr->display); + event.xmap.send_event = False; + event.xmap.display = winPtr->display; + event.xmap.event = winPtr->window; + event.xmap.window = winPtr->window; + event.xmap.override_redirect = winPtr->atts.override_redirect; + Tk_HandleEvent(&event); } /* @@ -1902,9 +1900,8 @@ Tk_UnmapWindow( return; } winPtr->flags &= ~TK_MAPPED; - if ((winPtr->window != None) - && (XUnmapWindow(winPtr->display, winPtr->window) == Success) - && !(winPtr->flags & TK_TOP_HIERARCHY)) { + XUnmapWindow(winPtr->display, winPtr->window); + if (!(winPtr->flags & TK_TOP_HIERARCHY)) { XEvent event; event.type = UnmapNotify; |