diff options
author | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-09-30 09:39:01 (GMT) |
---|---|---|
committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-09-30 09:39:01 (GMT) |
commit | 82956c540dd1ab3e25864ba4dfb43b40de94b5fe (patch) | |
tree | 42f1776235320cb88c75cc1b2d3ed8758f67e67a | |
parent | 2fca0cb014157a76e9915e8038a7165eb84eb64c (diff) | |
download | tk-82956c540dd1ab3e25864ba4dfb43b40de94b5fe.zip tk-82956c540dd1ab3e25864ba4dfb43b40de94b5fe.tar.gz tk-82956c540dd1ab3e25864ba4dfb43b40de94b5fe.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.
FossilOrigin-Name: bbd8ef990c4ce6a69d8daa9dedc9493b5b521e41
-rw-r--r-- | doc/panedwindow.n | 2 | ||||
-rw-r--r-- | generic/tkPanedWindow.c | 2 |
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 /* |