diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-06-30 03:28:23 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-06-30 03:28:23 (GMT) |
| commit | dc116134f48b6ca5ae3626c16146791903e0e1f7 (patch) | |
| tree | fe994c6ddb9dc1164639734b387a76cbab87be32 /generic/tkPanedWindow.c | |
| parent | 84d7c9f433ad914d283c90ebbfdac79df2f596e1 (diff) | |
| download | tk-core_stabilizer_branch.zip tk-core_stabilizer_branch.tar.gz tk-core_stabilizer_branch.tar.bz2 | |
merge updates from core-8-5-branch
core_stabilizer_branch
Diffstat (limited to 'generic/tkPanedWindow.c')
| -rw-r--r-- | generic/tkPanedWindow.c | 17 |
1 files changed, 13 insertions, 4 deletions
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. */ |