summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 09:39:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 09:39:01 (GMT)
commitf85821a6b74d6b56588c8f06b242bc5ca703ca5a (patch)
tree42f1776235320cb88c75cc1b2d3ed8758f67e67a
parent318860717b30126cdcbf60eccf3e6124d9630649 (diff)
downloadtk-f85821a6b74d6b56588c8f06b242bc5ca703ca5a.zip
tk-f85821a6b74d6b56588c8f06b242bc5ca703ca5a.tar.gz
tk-f85821a6b74d6b56588c8f06b242bc5ca703ca5a.tar.bz2
Carefull inspection shows that the default for -proxyrelief should be the value of -sashrelief, in order to be 100% compatible with how it behaved before.
-rw-r--r--doc/panedwindow.n2
-rw-r--r--generic/tkPanedWindow.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index 9ee79ec..ce7adc3 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.n
@@ -38,7 +38,7 @@ Specifies the borderwidth of the proxy. May be any value accepted by
value of the \fB-borderwidth\fR option will be used.
.OP \-proxyrelief proxyRelief ProxyRelief
Relief to use when drawing the proxy. May be any of the standard Tk
-relief values. If an empty string, the value of the \fB-relief\fR
+relief values. If an empty string, the value of the \fB-sashrelief\fR
option will be used.
.OP \-opaqueresize opaqueResize OpaqueResize
Specifies whether panes should be resized as a sash is moved (true),
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 8699ac3..85180bc 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -2786,7 +2786,7 @@ DisplayProxyWindow(
pwPtr->proxyBackground ? pwPtr->proxyBackground : pwPtr->background,
0, 0, Tk_Width(tkwin), Tk_Height(tkwin),
pwPtr->proxyBorderWidthPtr ? pwPtr->proxyBorderWidth : pwPtr->borderWidth,
- (pwPtr->proxyRelief != TK_RELIEF_NULL) ? pwPtr->proxyRelief : pwPtr->relief);
+ (pwPtr->proxyRelief != TK_RELIEF_NULL) ? pwPtr->proxyRelief : pwPtr->sashRelief);
#ifndef TK_NO_DOUBLE_BUFFERING
/*