summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjenglish@flightlab.com <jenglish>2002-08-08 22:32:11 (GMT)
committerjenglish@flightlab.com <jenglish>2002-08-08 22:32:11 (GMT)
commitbd684d1311f1ad34e38dfe88e4037f946e864f8f (patch)
tree80c879fd85e4184f38319f75d95ad352e11e6d88 /win
parenta282f5406a671f69d84c910c14ac3f5ae3accbdf (diff)
downloadtk-bd684d1311f1ad34e38dfe88e4037f946e864f8f.zip
tk-bd684d1311f1ad34e38dfe88e4037f946e864f8f.tar.gz
tk-bd684d1311f1ad34e38dfe88e4037f946e864f8f.tar.bz2
Fix for Tk Bug #592201 "wm transient fails with two masters".
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 22996e9..5248a54 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.51 2002/08/05 14:01:15 dgp Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.52 2002/08/08 22:32:12 jenglish Exp $
*/
#include "tkWinInt.h"
@@ -4625,14 +4625,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,
VisibilityChangeMask|StructureNotifyMask,
WmWaitVisibilityOrMapProc, (ClientData) winPtr);
}
+ masterPtr->wmInfoPtr->numTransients++;
Tk_CreateEventHandler((Tk_Window) masterPtr,
VisibilityChangeMask|StructureNotifyMask,
WmWaitVisibilityOrMapProc, (ClientData) winPtr);