2005-11-16 Don Porter <dgp@users.sourceforge.net>

        *** 8.4.12 TAGGED FOR RELEASE ***

        * changes:      Update changes for 8.4.12 release

        * mac/tkMacWm.c:        Restored consistent error checking and
        * macosx/tkMacOSXWm.c:  messages among different platform's
        * tests/wm.test:        [wm grid] commands.  [Bug 1323972].
        * win/tkWinWm.c:

6 files changed, 43 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 54bf3f2..f95e545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-11-16  Don Porter  <dgp@users.sourceforge.net>
+
+	*** 8.4.12 TAGGED FOR RELEASE ***
+
+	* changes:	Update changes for 8.4.12 release
+
+	* mac/tkMacWm.c:	Restored consistent error checking and
+	* macosx/tkMacOSXWm.c:	messages among different platform's
+	* tests/wm.test:	[wm grid] commands.  [Bug 1323972].
+	* win/tkWinWm.c:
+
 2005-12-01  Kevin Kenny  <kennykb@acm.org>
 
 	* win/makefile.vc: restored buildability.
diff --git a/changes b/changes
index 004061f..7c454b5 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.64.2.26 2005/11/16 16:21:21 dgp Exp $
+RCS: @(#) $Id: changes,v 1.64.2.27 2005/12/01 18:31:42 dgp Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -5854,4 +5854,18 @@ Documentation improvements [1087842,1081527,1115907,etc.]
 
 2005-11-06 (platform support) OpenBSD missing LIBS (thoyts)
 
---- Released 8.4.12, November 30, 2005 --- See ChangeLog for details ---
+2005-11-22 (bug fix)[1353414] [selection get] compat w/OpenOffice.org (fellows)
+
+2005-11-22 (bug fix)[1335485] dialog and space in widget name (taylor,fellows)
+
+2005-11-29 (enhancement)[1369597] Win 64: --enable-64bit=amd64|ia64 (hobbs)
+
+2005-11-29 (bug fix)[1252259] clear initial % from console (lawlor,hobbs)
+
+2005-11-30 (bug fix)[1289565] ClientMessage handling (staplin,hobbs)
+
+2005-11-30 (bug fix)[1086049] [wm attributes -topmost] fix (courtney,hobbs)
+
+2005-12-01 (bug fix)[1353416] [tk_popup] wrong post location (fvogelnew1,hobbs)
+
+--- Released 8.4.12, Decemeber 1, 2005 --- See ChangeLog for details ---
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index d313633..17dd539 100644
--- a/mac/tkMacWm.c
+++ b/mac/tkMacWm.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacWm.c,v 1.24 2003/02/09 07:51:04 hobbs Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.24.2.1 2005/12/01 18:31:43 dgp Exp $
  */
 
 #include <Gestalt.h>
@@ -1512,12 +1512,12 @@ WmGridCmd(tkwin, winPtr, interp, objc, objv)
 	    Tcl_SetResult(interp, "baseHeight can't be < 0", TCL_STATIC);
 	    return TCL_ERROR;
 	}
-	if (widthInc < 0) {
-	    Tcl_SetResult(interp, "widthInc can't be < 0", TCL_STATIC);
+	if (widthInc <= 0) {
+	    Tcl_SetResult(interp, "widthInc can't be <= 0", TCL_STATIC);
 	    return TCL_ERROR;
 	}
-	if (heightInc < 0) {
-	    Tcl_SetResult(interp, "heightInc can't be < 0", TCL_STATIC);
+	if (heightInc <= 0) {
+	    Tcl_SetResult(interp, "heightInc can't be <= 0", TCL_STATIC);
 	    return TCL_ERROR;
 	}
 	Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 48cc210..73a9839 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.7.2.14 2005/11/27 02:36:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.15 2005/12/01 18:31:43 dgp Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -1474,12 +1474,12 @@ Tcl_Obj *CONST objv[];	/* Argument objects. */
             Tcl_SetResult(interp, "baseHeight can't be < 0", TCL_STATIC);
             return TCL_ERROR;
         }
-        if (widthInc < 0) {
-            Tcl_SetResult(interp, "widthInc can't be < 0", TCL_STATIC);
+        if (widthInc <= 0) {
+            Tcl_SetResult(interp, "widthInc can't be <= 0", TCL_STATIC);
             return TCL_ERROR;
         }
-        if (heightInc < 0) {
-            Tcl_SetResult(interp, "heightInc can't be < 0", TCL_STATIC);
+        if (heightInc <= 0) {
+            Tcl_SetResult(interp, "heightInc can't be <= 0", TCL_STATIC);
             return TCL_ERROR;
         }
         Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
diff --git a/tests/wm.test b/tests/wm.test
index 7313891..e34d58d 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.5 2005/10/10 15:19:41 patthoyts Exp $
+# RCS: @(#) $Id: wm.test,v 1.21.2.6 2005/12/01 18:31:43 dgp Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
@@ -404,11 +404,11 @@ test wm-grid-1.10 {usage} {
 
 test wm-grid-1.11 {usage} {
     list [catch {wm grid . 13 14 -1 16} msg] $msg
-} {1 {widthInc can't be < 0}}
+} {1 {widthInc can't be <= 0}}
 
 test wm-grid-1.12 {usage} {
     list [catch {wm grid . 13 14 15 -1} msg] $msg
-} {1 {heightInc can't be < 0}}
+} {1 {heightInc can't be <= 0}}
 
 test wm-grid-2.1 {setting and reading values} {
     set result {}
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 4db7a24..38a1297 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.22 2005/12/01 07:34:54 hobbs Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.23 2005/12/01 18:31:43 dgp Exp $
  */
 
 #include "tkWinInt.h"
@@ -3579,11 +3579,11 @@ WmGridCmd(tkwin, winPtr, interp, objc, objv)
 	    return TCL_ERROR;
 	}
 	if (widthInc <= 0) {
-	    Tcl_SetResult(interp, "widthInc can't be < 0", TCL_STATIC);
+	    Tcl_SetResult(interp, "widthInc can't be <= 0", TCL_STATIC);
 	    return TCL_ERROR;
 	}
 	if (heightInc <= 0) {
-	    Tcl_SetResult(interp, "heightInc can't be < 0", TCL_STATIC);
+	    Tcl_SetResult(interp, "heightInc can't be <= 0", TCL_STATIC);
 	    return TCL_ERROR;
 	}
 	Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,