summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2004-10-21 01:12:28 (GMT)
committerhobbs <hobbs>2004-10-21 01:12:28 (GMT)
commit5ef3e7417c07293527b9e334bb515ec37e29ef95 (patch)
treeedc9b136059f1e5b4b4eab3ab0f2cfdda12ae16f
parent7ab5ea85960517b81f0466e0121003ff45e98369 (diff)
downloadtk-5ef3e7417c07293527b9e334bb515ec37e29ef95.zip
tk-5ef3e7417c07293527b9e334bb515ec37e29ef95.tar.gz
tk-5ef3e7417c07293527b9e334bb515ec37e29ef95.tar.bz2
* win/tkWinWm.c (UpdateWrapper): pass SWP_NOOWNERZORDER to
SetWindowPos when maintaining win Z order, to prevent parent from flashing (adjusting Z order).
-rw-r--r--ChangeLog6
-rw-r--r--win/tkWinWm.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ff7e0fa..fbbf19f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-20 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tkWinWm.c (UpdateWrapper): pass SWP_NOOWNERZORDER to
+ SetWindowPos when maintaining win Z order, to prevent parent
+ from flashing (adjusting Z order).
+
2004-10-05 Jeff Hobbs <jeffh@ActiveState.com>
Backport of 8.5 wm iconphoto that added support for Tk photo
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 441f83e..73100be 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.54.2.14 2004/10/05 22:27:28 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.15 2004/10/21 01:12:28 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -2202,7 +2202,8 @@ UpdateWrapper(winPtr)
wmPtr->hints.initial_state = WithdrawnState;
if (nextHWND) {
SetWindowPos(wmPtr->wrapper, nextHWND, 0, 0, 0, 0,
- SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_NOSENDCHANGING);
+ SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|SWP_NOSENDCHANGING
+ |SWP_NOOWNERZORDER);
}
TkpWmSetState(winPtr, state);