summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-06-24 05:31:35 (GMT)
committerhobbs <hobbs>2002-06-24 05:31:35 (GMT)
commit1bbe45f4ed5cf9e614ac085fc02bf0aeb8ca7bc7 (patch)
treec275e6175fc9c1779bedd58b877ffd0e42aeb65e
parentaf87e666b0a0cd182f236daa4ab5b513858cfd7e (diff)
downloadtk-1bbe45f4ed5cf9e614ac085fc02bf0aeb8ca7bc7.zip
tk-1bbe45f4ed5cf9e614ac085fc02bf0aeb8ca7bc7.tar.gz
tk-1bbe45f4ed5cf9e614ac085fc02bf0aeb8ca7bc7.tar.bz2
* win/tkWinWm.c (UpdateGeometryInfo): remove the check for a null
wrapper introduced in r1.41 on 2002-06-15 because it prevented geometry setting from taking effect if the window was not on the screen. Another check may go in it's place as IsIconic and IsZoomed should not be passed NULL.
-rw-r--r--ChangeLog8
-rw-r--r--win/tkWinWm.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 40cdadd..bdb0fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-23 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/tkWinWm.c (UpdateGeometryInfo): remove the check for a null
+ wrapper introduced in r1.41 on 2002-06-15 because it prevented
+ geometry setting from taking effect if the window was not on the
+ screen. Another check may go in it's place as IsIconic and
+ IsZoomed should not be passed NULL.
+
2002-06-22 Mo DeJong <mdejong@users.sourceforge.net>
* tests/wm.test: Remove invalid minsize test. Add update
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 376a42b..58c4c3d 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.44 2002/06/24 02:17:57 mdejong Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.45 2002/06/24 05:31:35 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -3823,8 +3823,7 @@ UpdateGeometryInfo(clientData)
* state of the window changes.
*/
- if ((wmPtr->wrapper == NULL)
- || IsIconic(wmPtr->wrapper) || IsZoomed(wmPtr->wrapper)) {
+ if (IsIconic(wmPtr->wrapper) || IsZoomed(wmPtr->wrapper)) {
return;
}