summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2003-02-20 21:08:29 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2003-02-20 21:08:29 (GMT)
commit88270da888bd830f92d6e4210abe7bdd03eeac8c (patch)
tree576ae3eebae88ffe3f352d0c0c98ce9a9eea6af7 /generic
parent3bd078b4e41cc6c97c8b54236f061fb9631b2e1c (diff)
downloadtk-88270da888bd830f92d6e4210abe7bdd03eeac8c.zip
tk-88270da888bd830f92d6e4210abe7bdd03eeac8c.tar.gz
tk-88270da888bd830f92d6e4210abe7bdd03eeac8c.tar.bz2
Fixed calculation of the last slave's
size when increasing the size of the panedwindow. [Bug #689099]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkPanedWindow.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index efc4793..a28f7e8 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.10 2002/10/08 19:57:48 hobbs Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.11 2003/02/20 21:08:30 pspjuth Exp $
*/
#include "tkPort.h"
@@ -1635,8 +1635,7 @@ ArrangePanes(clientData)
if (i == pwPtr->numSlaves - 1 && Tk_IsMapped(pwPtr->tkwin)) {
if (Tk_Width(pwPtr->tkwin) > Tk_ReqWidth(pwPtr->tkwin)) {
paneWidth += Tk_Width(pwPtr->tkwin) -
- Tk_ReqWidth(pwPtr->tkwin) -
- Tk_InternalBorderWidth(pwPtr->tkwin);
+ Tk_ReqWidth(pwPtr->tkwin);
}
}
paneHeight = Tk_Height(pwPtr->tkwin) - (2 * slavePtr->pady) -
@@ -1646,8 +1645,7 @@ ArrangePanes(clientData)
if (i == pwPtr->numSlaves - 1 && Tk_IsMapped(pwPtr->tkwin)) {
if (Tk_Height(pwPtr->tkwin) > Tk_ReqHeight(pwPtr->tkwin)) {
paneHeight += Tk_Height(pwPtr->tkwin) -
- Tk_ReqHeight(pwPtr->tkwin) -
- Tk_InternalBorderWidth(pwPtr->tkwin);
+ Tk_ReqHeight(pwPtr->tkwin);
}
}
paneWidth = Tk_Width(pwPtr->tkwin) - (2 * slavePtr->padx) -