summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixWm.c
diff options
context:
space:
mode:
authormdejong <mdejong>2002-08-08 23:49:50 (GMT)
committermdejong <mdejong>2002-08-08 23:49:50 (GMT)
commitc1f950921fb5d2fead5f35274465d7ba395f4712 (patch)
treea67b03cb1f096d782ff149dea7e089557c9f9227 /unix/tkUnixWm.c
parent00a9090dae24f29b7c6f950ce0ee494c89261256 (diff)
downloadtk-c1f950921fb5d2fead5f35274465d7ba395f4712.zip
tk-c1f950921fb5d2fead5f35274465d7ba395f4712.tar.gz
tk-c1f950921fb5d2fead5f35274465d7ba395f4712.tar.bz2
* unix/tkUnixWm.c (WmTransientCmd): Apply fix for
wm transient assertion error that was applied to tkWinWm.c for Tk Bug #592201.
Diffstat (limited to 'unix/tkUnixWm.c')
-rw-r--r--unix/tkUnixWm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index ee920b9..8c4bae4 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.32 2002/08/08 23:45:01 mdejong Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.33 2002/08/08 23:49:50 mdejong Exp $
*/
#include "tkPort.h"
@@ -3063,14 +3063,14 @@ WmTransientCmd(tkwin, winPtr, interp, objc, objv)
* transient states reflect the state of the master.
*/
- if (wmPtr->masterPtr == NULL) {
- masterPtr->wmInfoPtr->numTransients++;
- } else {
+ if (wmPtr->masterPtr != NULL) {
+ wmPtr->masterPtr->wmInfoPtr->numTransients--;
Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) winPtr);
}
+ masterPtr->wmInfoPtr->numTransients++;
Tk_CreateEventHandler((Tk_Window) masterPtr,
StructureNotifyMask,
WmWaitMapProc, (ClientData) winPtr);