merge updates from core-8-5-branch core_stabilizer_branch

3 files changed, 23 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 06ed0b7..cbcef30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2008-06-25  Don Porter  <dgp@users.sourceforge.net>
+2008-06-29  Don Porter  <dgp@users.sourceforge.net>
 
 	*** 8.5.3 TAGGED FOR RELEASE ***
 
@@ -12,6 +12,14 @@
 	* unix/configure:	autoconf-2.59
 	* win/configure:
 
+2008-06-26  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tkPanedWindow.c (PanedWindowProxyCommand)
+	(DisplayPanedWindow): Ensure that a zero width never gets fed to the
+	underlying window system. [Bug 1639824]  (Backport fix from dkf).
+
+2008-06-25  Don Porter  <dgp@users.sourceforge.net>
+
 	* changes:	Updates for 8.5.3 release.
 
 2008-06-20  Joe English  <jenglish@users.sourceforge.net>
diff --git a/changes b/changes
index 33aa170..4451035 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.107.2.15 2008/06/25 17:06:36 dgp Exp $
+RCS: @(#) $Id: changes,v 1.107.2.16 2008/06/30 03:28:23 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
@@ -6508,8 +6508,6 @@ Several documentation and release notes improvements
 
 2008-04-14 (bug fix)[1941740] [tk_chooseColor -title] (thoyts)
 
-2008-04-16 (interface)[1938497] make stubs tables 'static const' (steffen)
-
 2008-04-17 (bug fix)[1327482] canvas item <Enter> events (wangnick)
 
 2008-05-23 (bug fix)[1967576] ttk::label height or width 0 panic (lawlor)
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index b69a8cb..ec6586e 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.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: tkPanedWindow.c,v 1.28.2.1 2007/09/07 01:25:36 dgp Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.28.2.2 2008/06/30 03:28:23 dgp Exp $
  */
 
 #include "default.h"
@@ -1459,9 +1459,11 @@ DisplayPanedWindow(
 	if (slavePtr->hide) {
 	    continue;
 	}
-	Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
-		slavePtr->sashx, slavePtr->sashy,
-		sashWidth, sashHeight, 1, pwPtr->sashRelief);
+	if (sashWidth > 0 && sashHeight > 0) {
+	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
+		    slavePtr->sashx, slavePtr->sashy, sashWidth, sashHeight,
+		    1, pwPtr->sashRelief);
+	}
 	if (pwPtr->showHandle) {
 	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
 		    slavePtr->handlex, slavePtr->handley,
@@ -2831,6 +2833,13 @@ PanedWindowProxyCommand(
 		    (2 * Tk_InternalBorderWidth(pwPtr->tkwin));
 	}
 
+        if (sashWidth < 1) {
+            sashWidth = 1;
+        }
+        if (sashHeight < 1) {
+            sashHeight = 1;
+        }
+
 	/*
 	 * Stash the proxy coordinates for future "proxy coord" calls.
 	 */