summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authormdejong <mdejong>2002-06-24 02:17:57 (GMT)
committermdejong <mdejong>2002-06-24 02:17:57 (GMT)
commit890c34e8889317e09ba6b4a4c328e16b4712b9c7 (patch)
treeedbc5e0880c2a9fa6c82684e50af26e54f9b776b /unix
parentada9b40cb1ed12dff8ae71d167aeeea17bcade14 (diff)
downloadtk-890c34e8889317e09ba6b4a4c328e16b4712b9c7.zip
tk-890c34e8889317e09ba6b4a4c328e16b4712b9c7.tar.gz
tk-890c34e8889317e09ba6b4a4c328e16b4712b9c7.tar.bz2
* tests/wm.test: Remove invalid minsize test. Add update
calls to wm transient tests so that idle handlers get run. This is needed to get the tests to pass under Win32. * unix/tkUnixWm.c (WmWaitMapProc): Move the special transient withdrawn check into the if body to make it easier to set a breakpoint on this test inside a debugger. No functional changes. * win/tkWinWm.c (WmWaitVisibilityOrMapProc): Ditto.
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixWm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index cfc1d1c..0de4103 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixWm.c,v 1.25 2002/06/22 10:13:26 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.26 2002/06/24 02:17:57 mdejong Exp $
*/
#include "tkPort.h"
@@ -2211,9 +2211,9 @@ WmWaitMapProc(clientData, eventPtr)
if (masterPtr == NULL)
return;
- if (eventPtr->type == MapNotify &&
- !(winPtr->wmInfoPtr->flags & WM_TRANSIENT_WITHDRAWN)) {
- (void) TkpWmSetState(winPtr, NormalState);
+ if (eventPtr->type == MapNotify) {
+ if (!(winPtr->wmInfoPtr->flags & WM_TRANSIENT_WITHDRAWN))
+ (void) TkpWmSetState(winPtr, NormalState);
} else if (eventPtr->type == UnmapNotify) {
(void) TkpWmSetState(winPtr, WithdrawnState);
}