* tests/wm.test: Add Win32 test cases for attributes

	subcommand.
	* win/tkWinWm.c (WmAttributesCmd): Fixup broken
	option processing logic for attributes subcommand.

3 files changed, 35 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index fd6b8da..718988a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-29  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* tests/wm.test: Add Win32 test cases for attributes
+	subcommand.
+	* win/tkWinWm.c (WmAttributesCmd): Fixup broken
+	option processing logic for attributes subcommand.
+
 2004-10-29  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* win/makefile.vc (DOTVERSION): Was installing 8.4 relabelled as 8.5
diff --git a/tests/wm.test b/tests/wm.test
index 9534fa7..215f4df 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: wm.test,v 1.21.2.2 2004/10/05 22:27:27 hobbs Exp $
+# RCS: @(#) $Id: wm.test,v 1.21.2.3 2004/10/29 22:34:06 mdejong Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
@@ -134,7 +134,15 @@ test wm-attributes-1.2.1 {usage} {pcOnly} {
     list [catch {wm attributes . _} err] $err
 } {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-disabled ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}}
 
-test wm-attributes-1.2.2 {usage} {macOrUnix} {
+test wm-attributes-1.2.2 {usage} {pcOnly} {
+    list [catch {wm attributes . -alpha 1.0 -disabled} err] $err
+} {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-disabled ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}}
+
+test wm-attributes-1.2.3 {usage} {pcOnly} {
+    list [catch {wm attributes . -to} err] $err
+} {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-disabled ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}}
+
+test wm-attributes-1.2.4 {usage} {macOrUnix} {
     list [catch {wm attributes . _} err] $err
 } {1 {wrong # args: should be "wm attributes window"}}
 
@@ -1624,6 +1632,13 @@ test wm-state-2.17 {state change after map} {
     wm state .t
 } {normal}
 
+test wm-state-2.18 {state change after map} {pcOnly} {
+    deleteWindows
+    toplevel .t
+    update
+    wm state .t zoomed
+    wm state .t
+} {zoomed}
 
 test wm-withdraw-1.1 {usage} {
     list [catch {wm withdraw} err] $err
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 73100be..60a0eee 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.15 2004/10/21 01:12:28 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.16 2004/10/29 22:34:06 mdejong Exp $
  */
 
 #include "tkWinInt.h"
@@ -2859,7 +2859,7 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv)
     char *string;
     int i, boolean, length;
 
-    if (objc < 3) {
+    if ((objc < 3) || ((objc > 5) && ((objc%2) == 0))) {
         configArgs:
 	Tcl_WrongNumArgs(interp, 2, objv,
 		"window"
@@ -2902,12 +2902,12 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv)
 	} else if (strncmp(string, "-alpha", length) == 0) {
 	    stylePtr = &exStyle;
 	    styleBit = WS_EX_LAYERED;
-	} else if ((strncmp(string, "-toolwindow", length) == 0)
-		   && (length >= 3)) {
+	} else if ((length > 3)
+		   && (strncmp(string, "-toolwindow", length) == 0)) {
 	    stylePtr = &exStyle;
 	    styleBit = WS_EX_TOOLWINDOW;
-	} else if ((strncmp(string, "-topmost", length) == 0)
-		   && (length >= 3)) {
+	} else if ((length > 3)
+		   && (strncmp(string, "-topmost", length) == 0)) {
 	    stylePtr = &exStyle;
 	    styleBit = WS_EX_TOPMOST;
 	    if ((i < objc-1) && (winPtr->flags & TK_EMBEDDED)) {
@@ -2922,7 +2922,7 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv)
 	if (styleBit == WS_EX_LAYERED) {
 	    double dval;
 
-	    if (i == objc-1) {
+	    if (objc == 4) {
 		Tcl_SetDoubleObj(Tcl_GetObjResult(interp), wmPtr->alpha);
 	    } else {
 		if ((i < objc-1) &&
@@ -2964,7 +2964,7 @@ WmAttributesCmd(tkwin, winPtr, interp, objc, objv)
 			    != TCL_OK)) {
 		return TCL_ERROR;
 	    }
-	    if (i == objc-1) {
+	    if (objc == 4) {
 		Tcl_SetIntObj(Tcl_GetObjResult(interp),
 			((*stylePtr & styleBit) != 0));
 	    } else if (boolean) {
@@ -4826,8 +4826,10 @@ WmStateCmd(tkwin, winPtr, interp, objc, objv)
 	} else if (index == OPT_WITHDRAWN) {
 	    wmPtr->flags |= WM_WITHDRAWN;
 	    TkpWmSetState(winPtr, WithdrawnState);
-	} else { /* OPT_ZOOMED */
+	} else if (index == OPT_ZOOMED) {
 	    TkpWmSetState(winPtr, ZoomState);
+	} else {
+	    Tcl_Panic("wm state not matched");
 	}
     } else {
 	if (wmPtr->iconFor != NULL) {