summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--win/tkWinWm.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d693d51..4c58df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-06 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/tkWinWm.c: corrected some errors from the previous commit
+
2008-10-05 Donal K. Fellows <dkf@users.sf.net>
* win/tkWinWm.c (WmAttributesCmd, WmOverrideredirectCmd)
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index db347bd..f9346eb 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.129 2008/10/05 18:22:22 dkf Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.130 2008/10/06 21:57:21 patthoyts Exp $
*/
#include "tkWinInt.h"
@@ -3019,7 +3019,7 @@ WmAspectCmd(
if (wmPtr->sizeHintsFlags & PAspect) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf("%d %d %d %d",
wmPtr->minAspect.x, wmPtr->minAspect.y,
- wmPtr->maxAspect.x, wmPtr->maxAspect.y);
+ wmPtr->maxAspect.x, wmPtr->maxAspect.y));
}
return TCL_OK;
}
@@ -3809,8 +3809,6 @@ WmGeometryCmd(
wmPtr->x = result >> 16;
wmPtr->y = result & 0x0000ffff;
}
- x = wmPtr->x;
- y = wmPtr->y;
Tcl_SetObjResult(interp, Tcl_ObjPrintf("%dx%d%c%d%c%d",
width, height, xSign, wmPtr->x, ySign, wmPtr->y));
return TCL_OK;