diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-31 17:33:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-31 17:33:10 (GMT) |
| commit | 295671a14522c8288356788da7ba93846f7e834e (patch) | |
| tree | 4bbfba90f1ff9a938eefed5855776e61a68c3bc9 | |
| parent | 18ae1a4538eeabc6f835e29b98e57652622e2130 (diff) | |
| download | tk-295671a14522c8288356788da7ba93846f7e834e.zip tk-295671a14522c8288356788da7ba93846f7e834e.tar.gz tk-295671a14522c8288356788da7ba93846f7e834e.tar.bz2 | |
merge updates from HEAD
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | doc/panedwindow.n | 15 |
2 files changed, 16 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2008-01-31 Donal K. Fellows <donal.k.fellows@man.ac.uk> + + * doc/panedwindow.n: Added proper description of -height and -width + options, which aren't "standard". Last of fallout from [Bug 1882495]. + 2008-01-30 Donal K. Fellows <donal.k.fellows@man.ac.uk> * doc/canvas.n, doc/listbox.n, doc/message.n: Fix erroneous listing of diff --git a/doc/panedwindow.n b/doc/panedwindow.n index 4b9be3f..c2b392a 100644 --- a/doc/panedwindow.n +++ b/doc/panedwindow.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: panedwindow.n,v 1.10.2.1 2007/11/01 16:37:15 dgp Exp $ +'\" RCS: @(#) $Id: panedwindow.n,v 1.10.2.2 2008/01/31 17:33:10 dgp Exp $ '\" .so man.macros .TH panedwindow n 8.4 Tk "Tk Built-In Commands" @@ -16,9 +16,8 @@ panedwindow \- Create and manipulate panedwindow widgets .SH SYNOPSIS \fBpanedwindow\fR \fIpathName \fR?\fIoptions\fR? .SO -\-background \-height \-width -\-borderwidth \-orient -\-cursor \-relief +\-background \-borderwidth \-cursor +\-orient \-relief .SE .SH "WIDGET-SPECIFIC OPTIONS" .OP \-handlepad handlePad HandlePad @@ -28,6 +27,10 @@ which to draw the handle. May be any value accepted by \fBTk_GetPixels\fR. .OP \-handlesize handleSize HandleSize Specifies the side length of a sash handle. Handles are always drawn as squares. May be any value accepted by \fBTk_GetPixels\fR. +.OP \-height height Height +Specifies a desired height for the overall panedwindow widget. May be any +value accepted by \fBTk_GetPixels\fR. If an empty string, the widget will be +made high enough to allow all contained widgets to have their natural height. .OP \-opaqueresize opaqueResize OpaqueResize Specifies whether panes should be resized as a sash is moved (true), or if resizing should be deferred until the sash is placed (false). @@ -47,6 +50,10 @@ Specifies the width of each sash. May be any value accepted by .OP \-showhandle showHandle ShowHandle Specifies whether sash handles should be shown. May be any valid Tcl boolean value. +.OP \-width width Width +Specifies a desired width for the overall panedwindow widget. May be any +value accepted by \fBTk_GetPixels\fR. If an empty string, the widget will be +made wide enough to allow all contained widgets to have their natural width. .BE .SH DESCRIPTION .PP |